From dea41f364aeffd4b5fbb58c1edf1019957f37694 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 1 Feb 2019 14:45:08 +0900 Subject: [PATCH] vhost: Use spdk_json_write_named_* APIs throughout Change-Id: I38042034646461e86c1dc747f7ed28e7a9b6f815 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/442943 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker --- lib/vhost/vhost_blk.c | 6 ++---- lib/vhost/vhost_scsi.c | 21 +++++++-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c index 266bd8864..ddd22c12a 100644 --- a/lib/vhost/vhost_blk.c +++ b/lib/vhost/vhost_blk.c @@ -827,11 +827,9 @@ spdk_vhost_blk_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_writ } assert(bvdev != NULL); - spdk_json_write_name(w, "block"); - spdk_json_write_object_begin(w); + spdk_json_write_named_object_begin(w, "block"); - spdk_json_write_name(w, "readonly"); - spdk_json_write_bool(w, bvdev->readonly); + spdk_json_write_named_bool(w, "readonly", bvdev->readonly); spdk_json_write_name(w, "bdev"); if (bdev) { diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index 26e816510..9988435d2 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -1382,8 +1382,7 @@ spdk_vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_wri uint32_t lun_idx; assert(vdev != NULL); - spdk_json_write_name(w, "scsi"); - spdk_json_write_array_begin(w); + spdk_json_write_named_array_begin(w, "scsi"); for (dev_idx = 0; dev_idx < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS; dev_idx++) { sdev = spdk_vhost_scsi_dev_get_tgt(vdev, dev_idx); if (!sdev) { @@ -1392,17 +1391,13 @@ spdk_vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_wri spdk_json_write_object_begin(w); - spdk_json_write_name(w, "scsi_dev_num"); - spdk_json_write_uint32(w, dev_idx); + spdk_json_write_named_uint32(w, "scsi_dev_num", dev_idx); - spdk_json_write_name(w, "id"); - spdk_json_write_int32(w, spdk_scsi_dev_get_id(sdev)); + spdk_json_write_named_uint32(w, "id", spdk_scsi_dev_get_id(sdev)); - spdk_json_write_name(w, "target_name"); - spdk_json_write_string(w, spdk_scsi_dev_get_name(sdev)); + spdk_json_write_named_string(w, "target_name", spdk_scsi_dev_get_name(sdev)); - spdk_json_write_name(w, "luns"); - spdk_json_write_array_begin(w); + spdk_json_write_named_array_begin(w, "luns"); for (lun_idx = 0; lun_idx < SPDK_SCSI_DEV_MAX_LUN; lun_idx++) { lun = spdk_scsi_dev_get_lun(sdev, lun_idx); @@ -1412,11 +1407,9 @@ spdk_vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_wri spdk_json_write_object_begin(w); - spdk_json_write_name(w, "id"); - spdk_json_write_int32(w, spdk_scsi_lun_get_id(lun)); + spdk_json_write_named_int32(w, "id", spdk_scsi_lun_get_id(lun)); - spdk_json_write_name(w, "bdev_name"); - spdk_json_write_string(w, spdk_scsi_lun_get_bdev_name(lun)); + spdk_json_write_named_string(w, "bdev_name", spdk_scsi_lun_get_bdev_name(lun)); spdk_json_write_object_end(w); }