{"id":813263,"url":"http://patchwork.ozlabs.org/api/patches/813263/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505295366-25295-3-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-3-git-send-email-peterx@redhat.com>","list_archive_url":null,"date":"2017-09-13T09:36:04","name":"[2/4] tests: use qmp_device_del() where proper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a7354997078415ac4893ba2c5f79e972baccf898","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-3-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/813263/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813263/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xsc5949x8z9rxj\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 19:37:17 +1000 (AEST)","from localhost ([::1]:41202 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1ds46d-00018x-La\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 05:37:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51072)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1ds45u-00016J-1y\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1ds45t-0007WA-0J\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:30 -0400","from mx1.redhat.com ([209.132.183.28]:53518)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <peterx@redhat.com>) id 1ds45s-0007Vh-OQ\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:28 -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 C724713A49\n\tfor <qemu-devel@nongnu.org>; Wed, 13 Sep 2017 09:36:27 +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 2A6435C6DC;\n\tWed, 13 Sep 2017 09:36:24 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C724713A49","From":"Peter Xu <peterx@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 17:36:04 +0800","Message-Id":"<1505295366-25295-3-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.29]);\n\tWed, 13 Sep 2017 09:36:27 +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 2/4] tests: use qmp_device_del() where proper","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Fam Zheng <famz@redhat.com>, Markus Armbruster <armbru@redhat.com>,\n\tpeterx@redhat.com, Gerd Hoffmann <kraxel@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Signed-off-by: Peter Xu <peterx@redhat.com>\n---\n tests/libqos/usb.c        | 11 ++---------\n tests/usb-hcd-uhci-test.c | 14 +-------------\n tests/usb-hcd-xhci-test.c | 29 ++---------------------------\n 3 files changed, 5 insertions(+), 49 deletions(-)","diff":"diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c\nindex 0cdfaec..973dfdd 100644\n--- a/tests/libqos/usb.c\n+++ b/tests/libqos/usb.c\n@@ -60,14 +60,7 @@ void usb_test_hotplug(const char *hcd_id, const int port,\n         port_check();\n     }\n \n-    cmd = g_strdup_printf(\"{'execute': 'device_del',\"\n-                           \" 'arguments': {\"\n-                           \"   'id': 'usbdev%d'\"\n-                           \"}}\", port);\n-    response = qmp(cmd);\n+    cmd = g_strdup_printf(\"usbdev%d\", port);\n+    qmp_device_del(cmd);\n     g_free(cmd);\n-    g_assert(response);\n-    g_assert(qdict_haskey(response, \"event\"));\n-    g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n-    QDECREF(response);\n }\ndiff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c\nindex 5b500fe..7471275 100644\n--- a/tests/usb-hcd-uhci-test.c\n+++ b/tests/usb-hcd-uhci-test.c\n@@ -60,19 +60,7 @@ static void test_usb_storage_hotplug(void)\n     g_assert(!qdict_haskey(response, \"error\"));\n     QDECREF(response);\n \n-    response = qmp(\"{'execute': 'device_del',\"\n-                           \" 'arguments': {\"\n-                           \"   'id': 'usbdev0'\"\n-                           \"}}\");\n-    g_assert(response);\n-    g_assert(!qdict_haskey(response, \"error\"));\n-    QDECREF(response);\n-\n-    response = qmp(\"\");\n-    g_assert(response);\n-    g_assert(qdict_haskey(response, \"event\"));\n-    g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n-    QDECREF(response);\n+    qmp_device_del(\"usbdev0\");\n }\n \n int main(int argc, char **argv)\ndiff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c\nindex 031764d..156f8a3 100644\n--- a/tests/usb-hcd-xhci-test.c\n+++ b/tests/usb-hcd-xhci-test.c\n@@ -49,33 +49,8 @@ static void test_usb_uas_hotplug(void)\n         added disk is visible after BUS rescan\n     */\n \n-    response = qmp(\"{'execute': 'device_del',\"\n-                           \" 'arguments': {\"\n-                           \"   'id': 'scsi-hd'\"\n-                           \"}}\");\n-    g_assert(response);\n-    g_assert(!qdict_haskey(response, \"error\"));\n-    QDECREF(response);\n-\n-    response = qmp(\"\");\n-    g_assert(qdict_haskey(response, \"event\"));\n-    g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n-    QDECREF(response);\n-\n-\n-    response = qmp(\"{'execute': 'device_del',\"\n-                           \" 'arguments': {\"\n-                           \"   'id': 'uas'\"\n-                           \"}}\");\n-    g_assert(response);\n-    g_assert(!qdict_haskey(response, \"error\"));\n-    QDECREF(response);\n-\n-    response = qmp(\"\");\n-    g_assert(response);\n-    g_assert(qdict_haskey(response, \"event\"));\n-    g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n-    QDECREF(response);\n+    qmp_device_del(\"scsi-hd\");\n+    qmp_device_del(\"uas\");\n }\n \n int main(int argc, char **argv)\n","prefixes":["2/4"]}