]> git.proxmox.com Git - mirror_qemu.git/commit - tests/virtio-blk-test.c
tests: Clean up string interpolation around qtest_qmp_device_add()
authorMarkus Armbruster <armbru@redhat.com>
Mon, 6 Aug 2018 06:53:35 +0000 (08:53 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 16 Aug 2018 06:42:06 +0000 (08:42 +0200)
commit82cab70bd884a77fbe4e738725c32c88daca70d6
tree0e121a24b1b8b3c55c8f1fe21b9dca6d60bfad84
parent530e79a822b9a0336705f2b262546e843c4bf90b
tests: Clean up string interpolation around qtest_qmp_device_add()

Leaving interpolation into JSON to qmp() is more robust than building
QMP input manually, as explained in the commit before previous.

qtest_qmp_device_add() and its wrappers interpolate into JSON as
follows:

* qtest_qmp_device_add() interpolates members into a JSON object.

* So do its wrappers qpci_plug_device_test() and usb_test_hotplug().

* usb_test_hotplug() additionally interpolates strings and numbers
  into JSON strings.

Clean them up:

* Have qtest_qmp_device_add() take its extra device properties as
  arguments for qdict_from_jsonf_nofail() instead of a string
  containing JSON members.

* Drop qpci_plug_device_test(), use qtest_qmp_device_add()
  directly.

* Change usb_test_hotplug() parameter @port to string, to avoid
  interpolation.  Interpolate @hcd_id separately.

Bonus: gets rid of a non-literal format string.  A step towards
compile-time format string checking without triggering
-Wformat-nonliteral.

Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180806065344.7103-15-armbru@redhat.com>
18 files changed:
tests/cpu-plug-test.c
tests/e1000e-test.c
tests/ivshmem-test.c
tests/libqos/pci.c
tests/libqos/pci.h
tests/libqos/usb.c
tests/libqos/usb.h
tests/libqtest.c
tests/libqtest.h
tests/usb-hcd-ehci-test.c
tests/usb-hcd-ohci-test.c
tests/usb-hcd-uhci-test.c
tests/usb-hcd-xhci-test.c
tests/virtio-blk-test.c
tests/virtio-net-test.c
tests/virtio-rng-test.c
tests/virtio-scsi-test.c
tests/virtio-serial-test.c