mirror of https://gitee.com/openkylin/qemu.git
82cab70bd8
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> |
||
|---|---|---|
| .. | ||
| ahci.c | ||
| ahci.h | ||
| fw_cfg.c | ||
| fw_cfg.h | ||
| i2c-imx.c | ||
| i2c-omap.c | ||
| i2c.c | ||
| i2c.h | ||
| libqos-pc.c | ||
| libqos-pc.h | ||
| libqos-spapr.c | ||
| libqos-spapr.h | ||
| libqos.c | ||
| libqos.h | ||
| malloc-generic.c | ||
| malloc-generic.h | ||
| malloc-pc.c | ||
| malloc-pc.h | ||
| malloc-spapr.c | ||
| malloc-spapr.h | ||
| malloc.c | ||
| malloc.h | ||
| pci-pc.c | ||
| pci-pc.h | ||
| pci-spapr.c | ||
| pci-spapr.h | ||
| pci.c | ||
| pci.h | ||
| rtas.c | ||
| rtas.h | ||
| usb.c | ||
| usb.h | ||
| virtio-mmio.c | ||
| virtio-mmio.h | ||
| virtio-pci.c | ||
| virtio-pci.h | ||
| virtio.c | ||
| virtio.h | ||