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

virtio: Use spdk_json_write_named_* APIs throughout 



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


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

lib/virtio/virtio.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

lib/virtio/virtio_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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

lib/virtio/virtio_user.c

+2 −5
Original line number Diff line number Diff line
@@ -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