{"id":813267,"url":"http://patchwork.ozlabs.org/api/patches/813267/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505295366-25295-5-git-send-email-peterx@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505295366-25295-5-git-send-email-peterx@redhat.com>","list_archive_url":null,"date":"2017-09-13T09:36:06","name":"[4/4] tests: use qmp_device_add() where proper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"840ebf52a912582bf92b1742e08c76d2d603529f","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505295366-25295-5-git-send-email-peterx@redhat.com/mbox/","series":[{"id":2853,"url":"http://patchwork.ozlabs.org/api/series/2853/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2853","date":"2017-09-13T09:36:02","name":"qtest: fix \"device_del\" out-of-order events","version":1,"mbox":"http://patchwork.ozlabs.org/series/2853/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813267/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813267/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsc8l1MR3z9rxj\n\tfor ;\n\tWed, 13 Sep 2017 19:40:23 +1000 (AEST)","from localhost ([::1]:41215 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds49d-0004kJ-CS\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 05:40:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51202)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds465-0001Ig-N9\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds464-0007ce-IQ\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:41 -0400","from mx1.redhat.com ([209.132.183.28]:52592)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds464-0007cJ-9v\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:40 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 640C45F73C\n\tfor ; Wed, 13 Sep 2017 09:36:39 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-15-224.nay.redhat.com\n\t[10.66.15.224])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5014260461;\n\tWed, 13 Sep 2017 09:36:31 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 640C45F73C","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 17:36:06 +0800","Message-Id":"<1505295366-25295-5-git-send-email-peterx@redhat.com>","In-Reply-To":"<1505295366-25295-1-git-send-email-peterx@redhat.com>","References":"<1505295366-25295-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 13 Sep 2017 09:36:39 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 4/4] tests: use qmp_device_add() where proper","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Fam Zheng , Markus Armbruster ,\n\tpeterx@redhat.com, Gerd Hoffmann ,\n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Peter Xu \n---\n tests/libqos/pci.c | 15 +++------------\n tests/libqos/usb.c | 17 ++++-------------\n tests/usb-hcd-uhci-test.c | 14 ++------------\n tests/usb-hcd-xhci-test.c | 23 +++--------------------\n 4 files changed, 12 insertions(+), 57 deletions(-)","diff":"diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c\nindex 2dcdead..7724fcb 100644\n--- a/tests/libqos/pci.c\n+++ b/tests/libqos/pci.c\n@@ -394,21 +394,12 @@ QPCIBar qpci_legacy_iomap(QPCIDevice *dev, uint16_t addr)\n void qpci_plug_device_test(const char *driver, const char *id,\n uint8_t slot, const char *opts)\n {\n- QDict *response;\n char *cmd;\n \n- cmd = g_strdup_printf(\"{'execute': 'device_add',\"\n- \" 'arguments': {\"\n- \" 'driver': '%s',\"\n- \" 'addr': '%d',\"\n- \" %s%s\"\n- \" 'id': '%s'\"\n- \"}}\", driver, slot,\n+ cmd = g_strdup_printf(\"'driver': '%s', 'addr': '%d',\"\n+ \"%s%s 'id': '%s'\", driver, slot,\n opts ? opts : \"\", opts ? \",\" : \"\",\n id);\n- response = qmp(cmd);\n+ qmp_device_add(cmd);\n g_free(cmd);\n- g_assert(response);\n- g_assert(!qdict_haskey(response, \"error\"));\n- QDECREF(response);\n }\ndiff --git a/tests/libqos/usb.c b/tests/libqos/usb.c\nindex 973dfdd..4b23373 100644\n--- a/tests/libqos/usb.c\n+++ b/tests/libqos/usb.c\n@@ -40,21 +40,12 @@ void uhci_port_test(struct qhc *hc, int port, uint16_t expect)\n void usb_test_hotplug(const char *hcd_id, const int port,\n void (*port_check)(void))\n {\n- QDict *response;\n char *cmd;\n \n- cmd = g_strdup_printf(\"{'execute': 'device_add',\"\n- \" 'arguments': {\"\n- \" 'driver': 'usb-tablet',\"\n- \" 'port': '%d',\"\n- \" 'bus': '%s.0',\"\n- \" 'id': 'usbdev%d'\"\n- \"}}\", port, hcd_id, port);\n- response = qmp(cmd);\n- g_free(cmd);\n- g_assert(response);\n- g_assert(!qdict_haskey(response, \"error\"));\n- QDECREF(response);\n+ cmd = g_strdup_printf(\"'driver': 'usb-tablet', 'port': '%d',\"\n+ \"'bus': '%s.0', 'id': 'usbdev%d'\",\n+ port, hcd_id, port);\n+ qmp_device_add(cmd);\n \n if (port_check) {\n port_check();\ndiff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c\nindex 7471275..5f26207 100644\n--- a/tests/usb-hcd-uhci-test.c\n+++ b/tests/usb-hcd-uhci-test.c\n@@ -48,18 +48,8 @@ static void test_uhci_hotplug(void)\n \n static void test_usb_storage_hotplug(void)\n {\n- QDict *response;\n-\n- response = qmp(\"{'execute': 'device_add',\"\n- \" 'arguments': {\"\n- \" 'driver': 'usb-storage',\"\n- \" 'drive': 'drive0',\"\n- \" 'id': 'usbdev0'\"\n- \"}}\");\n- g_assert(response);\n- g_assert(!qdict_haskey(response, \"error\"));\n- QDECREF(response);\n-\n+ qmp_device_add(\"'driver': 'usb-storage',\"\n+ \"'drive': 'drive0', 'id': 'usbdev0'\");\n qmp_device_del(\"usbdev0\");\n }\n \ndiff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c\nindex 156f8a3..732b414 100644\n--- a/tests/usb-hcd-xhci-test.c\n+++ b/tests/usb-hcd-xhci-test.c\n@@ -23,26 +23,9 @@ static void test_xhci_hotplug(void)\n \n static void test_usb_uas_hotplug(void)\n {\n- QDict *response;\n-\n- response = qmp(\"{'execute': 'device_add',\"\n- \" 'arguments': {\"\n- \" 'driver': 'usb-uas',\"\n- \" 'id': 'uas'\"\n- \"}}\");\n- g_assert(response);\n- g_assert(!qdict_haskey(response, \"error\"));\n- QDECREF(response);\n-\n- response = qmp(\"{'execute': 'device_add',\"\n- \" 'arguments': {\"\n- \" 'driver': 'scsi-hd',\"\n- \" 'drive': 'drive0',\"\n- \" 'id': 'scsi-hd'\"\n- \"}}\");\n- g_assert(response);\n- g_assert(!qdict_haskey(response, \"error\"));\n- QDECREF(response);\n+ qmp_device_add(\"'driver': 'usb-uas', 'id': 'uas'\");\n+ qmp_device_add(\"'driver': 'scsi-hd', 'drive': 'drive0',\"\n+ \"'id': 'scsi-hd'\");\n \n /* TODO:\n UAS HBA driver in libqos, to check that\n","prefixes":["4/4"]}