From: Markus Armbruster <arm...@redhat.com> Leaving interpolation into JSON to qmp() is more robust than building QMP input manually, as explained in a previous commit.
The case in usb_test_hotplug() is slightly more complicated: it interpolates *into* JSON values. Clean it up by building the values separately, so we can again leave interpolation to qmp(). Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-Id: <1500645206-13559-6-git-send-email-arm...@redhat.com> [use qmp_args(), fix commit message typo] Signed-off-by: Eric Blake <ebl...@redhat.com> --- tests/libqos/usb.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c index 0cdfaecda7..498e6e60e7 100644 --- a/tests/libqos/usb.c +++ b/tests/libqos/usb.c @@ -40,18 +40,17 @@ void uhci_port_test(struct qhc *hc, int port, uint16_t expect) void usb_test_hotplug(const char *hcd_id, const int port, void (*port_check)(void)) { + char id[32]; + char *bus; QDict *response; - char *cmd; - cmd = g_strdup_printf("{'execute': 'device_add'," - " 'arguments': {" - " 'driver': 'usb-tablet'," - " 'port': '%d'," - " 'bus': '%s.0'," - " 'id': 'usbdev%d'" - "}}", port, hcd_id, port); - response = qmp(cmd); - g_free(cmd); + sprintf(id, "usbdev%d", port); + bus = g_strdup_printf("%s.0", hcd_id); + response = qmp_args("device_add", + "{'driver': 'usb-tablet'," + " 'port': %s, 'bus': %s, 'id': %s}", + id + 6, bus, id); + g_free(bus); g_assert(response); g_assert(!qdict_haskey(response, "error")); QDECREF(response); @@ -60,12 +59,7 @@ void usb_test_hotplug(const char *hcd_id, const int port, port_check(); } - cmd = g_strdup_printf("{'execute': 'device_del'," - " 'arguments': {" - " 'id': 'usbdev%d'" - "}}", port); - response = qmp(cmd); - g_free(cmd); + response = qmp_args("device_del", "{ 'id': %s }", id); g_assert(response); g_assert(qdict_haskey(response, "event")); g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED")); -- 2.13.3