Commit 21c74c8c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Darek Stojaczyk
Browse files

bdev: Use spdk_json_write_named_* APIs throughout 



Change-Id: I865dd025f2818fcdd65cbb655c7bd03d836f433f
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/442938


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 326d4eb5

lib/bdev/aio/bdev_aio.c

+2 −4
Original line number Diff line number Diff line
@@ -454,11 +454,9 @@ bdev_aio_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
{

	struct file_disk *fdisk = ctx;



	spdk_json_write_name(w, "aio");

	spdk_json_write_object_begin(w);

	spdk_json_write_named_object_begin(w, "aio");



	spdk_json_write_name(w, "filename");

	spdk_json_write_string(w, fdisk->filename);

	spdk_json_write_named_string(w, "filename", fdisk->filename);



	spdk_json_write_object_end(w);

lib/bdev/bdev.c

+2 −4
Original line number Diff line number Diff line
@@ -659,9 +659,8 @@ spdk_bdev_qos_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w) 


	spdk_json_write_object_begin(w);

	spdk_json_write_named_string(w, "method", "set_bdev_qos_limit");

	spdk_json_write_name(w, "params");



	spdk_json_write_object_begin(w);

	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_string(w, "name", bdev->name);

	for (i = 0; i < SPDK_BDEV_QOS_NUM_RATE_LIMIT_TYPES; i++) {

		if (limits[i] > 0) {
@@ -685,8 +684,7 @@ spdk_bdev_subsystem_config_json(struct spdk_json_write_ctx *w) 


	spdk_json_write_object_begin(w);

	spdk_json_write_named_string(w, "method", "set_bdev_options");

	spdk_json_write_name(w, "params");

	spdk_json_write_object_begin(w);

	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_uint32(w, "bdev_io_pool_size", g_bdev_opts.bdev_io_pool_size);

	spdk_json_write_named_uint32(w, "bdev_io_cache_size", g_bdev_opts.bdev_io_cache_size);

	spdk_json_write_object_end(w);

lib/bdev/error/vbdev_error.c

+2 −4
Original line number Diff line number Diff line
@@ -223,11 +223,9 @@ vbdev_error_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
	struct error_disk *error_disk = ctx;

	struct spdk_bdev *base_bdev = spdk_bdev_part_get_base_bdev(&error_disk->part);



	spdk_json_write_name(w, "error_disk");

	spdk_json_write_object_begin(w);

	spdk_json_write_named_object_begin(w, "error_disk");



	spdk_json_write_name(w, "base_bdev");

	spdk_json_write_string(w, base_bdev->name);

	spdk_json_write_named_string(w, "base_bdev", base_bdev->name);



	spdk_json_write_object_end(w);

lib/bdev/gpt/vbdev_gpt.c

+3 −6
Original line number Diff line number Diff line
@@ -252,14 +252,11 @@ vbdev_gpt_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
	struct spdk_gpt_partition_entry *gpt_entry = &gpt->partitions[gpt_disk->partition_index];

	uint64_t offset_blocks = spdk_bdev_part_get_offset_blocks(&gpt_disk->part);



	spdk_json_write_name(w, "gpt");

	spdk_json_write_object_begin(w);

	spdk_json_write_named_object_begin(w, "gpt");



	spdk_json_write_name(w, "base_bdev");

	spdk_json_write_string(w, spdk_bdev_get_name(part_base_bdev));

	spdk_json_write_named_string(w, "base_bdev", spdk_bdev_get_name(part_base_bdev));



	spdk_json_write_name(w, "offset_blocks");

	spdk_json_write_uint64(w, offset_blocks);

	spdk_json_write_named_uint64(w, "offset_blocks", offset_blocks);



	spdk_json_write_name(w, "partition_type_guid");

	write_guid(w, &gpt_entry->part_type_guid);

lib/bdev/iscsi/bdev_iscsi.c

+3 −6
Original line number Diff line number Diff line
@@ -534,12 +534,9 @@ bdev_iscsi_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) 
{

	struct bdev_iscsi_lun *lun = ctx;



	spdk_json_write_name(w, "iscsi");

	spdk_json_write_object_begin(w);

	spdk_json_write_name(w, "initiator_name");

	spdk_json_write_string(w, lun->initiator_iqn);

	spdk_json_write_name(w, "url");

	spdk_json_write_string(w, lun->url);

	spdk_json_write_named_object_begin(w, "iscsi");

	spdk_json_write_named_string(w, "initiator_name", lun->initiator_iqn);

	spdk_json_write_named_string(w, "url", lun->url);

	spdk_json_write_object_end(w);



	return 0;