Commit 87f7533a authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

bdev/malloc,null: save uuid when getting config 



The malloc and null bdevs generate a random UUID if it is not specified
in the construct RPC method; save the current UUID in save_config so we
can reproduce it in load_config.

Change-Id: Iabaa96fa3129189ae6acf3635345b98f71255fbd
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405110


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 2f2dde63

lib/bdev/malloc/bdev_malloc.c

+5 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ bdev_malloc_get_io_channel(void *ctx) 
static void

bdev_malloc_write_json_config(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w)

{

	char uuid_str[SPDK_UUID_STRING_LEN];



	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "construct_malloc_bdev");
@@ -358,6 +360,9 @@ bdev_malloc_write_json_config(struct spdk_bdev *bdev, struct spdk_json_write_ctx 
	spdk_json_write_named_string(w, "name", bdev->name);

	spdk_json_write_named_uint64(w, "num_blocks", bdev->blockcnt);

	spdk_json_write_named_uint32(w, "block_size", bdev->blocklen);

	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &bdev->uuid);

	spdk_json_write_named_string(w, "uuid", uuid_str);



	spdk_json_write_object_end(w);



	spdk_json_write_object_end(w);

lib/bdev/null/bdev_null.c

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ bdev_null_get_io_channel(void *ctx) 
static void

bdev_null_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w)

{

	char uuid_str[SPDK_UUID_STRING_LEN];



	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "construct_null_bdev");
@@ -142,6 +144,8 @@ bdev_null_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx * 
	spdk_json_write_named_string(w, "name", bdev->name);

	spdk_json_write_named_uint64(w, "num_blocks", bdev->blockcnt);

	spdk_json_write_named_uint32(w, "block_size", bdev->blocklen);

	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &bdev->uuid);

	spdk_json_write_named_string(w, "uuid", uuid_str);

	spdk_json_write_object_end(w);



	spdk_json_write_object_end(w);