From ab0f787e0b60151dc3d468258f7a76f039cfa4ab Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 1 Feb 2019 14:41:15 +0900 Subject: [PATCH] virtio: Use spdk_json_write_named_* APIs throughout Change-Id: I0e7f432e5ce8477e34907ba249f2a4e0d85e875e Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/442942 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker --- lib/virtio/virtio.c | 10 ++++------ lib/virtio/virtio_pci.c | 3 +-- lib/virtio/virtio_user.c | 7 ++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/virtio/virtio.c b/lib/virtio/virtio.c index 4a9b01bf1..73e4d7b92 100644 --- a/lib/virtio/virtio.c +++ b/lib/virtio/virtio.c @@ -721,14 +721,12 @@ virtio_dev_backend_ops(struct virtio_dev *dev) void virtio_dev_dump_json_info(struct virtio_dev *hw, struct spdk_json_write_ctx *w) { - spdk_json_write_name(w, "virtio"); - spdk_json_write_object_begin(w); + spdk_json_write_named_object_begin(w, "virtio"); - spdk_json_write_name(w, "vq_count"); - spdk_json_write_uint32(w, hw->max_queues); + spdk_json_write_named_uint32(w, "vq_count", hw->max_queues); - spdk_json_write_name(w, "vq_size"); - spdk_json_write_uint32(w, virtio_dev_backend_ops(hw)->get_queue_size(hw, 0)); + spdk_json_write_named_uint32(w, "vq_size", + virtio_dev_backend_ops(hw)->get_queue_size(hw, 0)); virtio_dev_backend_ops(hw)->dump_json_info(hw, w); diff --git a/lib/virtio/virtio_pci.c b/lib/virtio/virtio_pci.c index 62d53c0ce..f09bbea9b 100644 --- a/lib/virtio/virtio_pci.c +++ b/lib/virtio/virtio_pci.c @@ -122,9 +122,8 @@ pci_dump_json_info(struct virtio_dev *dev, struct spdk_json_write_ctx *w) spdk_json_write_string(w, "pci-legacy"); } - spdk_json_write_name(w, "pci_address"); spdk_pci_addr_fmt(addr, sizeof(addr), &pci_addr); - spdk_json_write_string(w, addr); + spdk_json_write_named_string(w, "pci_address", addr); } static void diff --git a/lib/virtio/virtio_user.c b/lib/virtio/virtio_user.c index fddc79ca8..d9975eec1 100644 --- a/lib/virtio/virtio_user.c +++ b/lib/virtio/virtio_user.c @@ -544,11 +544,8 @@ virtio_user_dump_json_info(struct virtio_dev *vdev, struct spdk_json_write_ctx * { struct virtio_user_dev *dev = vdev->ctx; - spdk_json_write_name(w, "type"); - spdk_json_write_string(w, "user"); - - spdk_json_write_name(w, "socket"); - spdk_json_write_string(w, dev->path); + spdk_json_write_named_string(w, "type", "user"); + spdk_json_write_named_string(w, "socket", dev->path); } static void