{"id":813262,"url":"http://patchwork.ozlabs.org/api/patches/813262/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505295366-25295-2-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-2-git-send-email-peterx@redhat.com>","list_archive_url":null,"date":"2017-09-13T09:36:03","name":"[1/4] libqtest: add qmp_device_del()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fe6cba7b5f72c58596a663a63f3a696ce6d66453","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-2-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/813262/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813262/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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xsc550QkVz9rxj\n\tfor ;\n\tWed, 13 Sep 2017 19:37:13 +1000 (AEST)","from localhost ([::1]:41201 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds46Z-00014i-4p\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 05:37:11 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51041)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds45q-000135-Qh\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds45p-0007Ur-Qr\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:26 -0400","from mx1.redhat.com ([209.132.183.28]:46234)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds45p-0007Ue-Iy\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:36:25 -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 A3570806A0\n\tfor ; Wed, 13 Sep 2017 09:36:24 +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 08F375C460;\n\tWed, 13 Sep 2017 09:36:21 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A3570806A0","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 17:36:03 +0800","Message-Id":"<1505295366-25295-2-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.26]);\n\tWed, 13 Sep 2017 09:36:24 +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 1/4] libqtest: add qmp_device_del()","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":"Device deletion is tricky since we'll get both a response and an event,\nwhile the order of arrival may vary. Provide a helper to handle this\ncomplexity.\n\nSigned-off-by: Peter Xu \n---\n tests/libqtest.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++\n tests/libqtest.h | 8 ++++++++\n 2 files changed, 56 insertions(+)","diff":"diff --git a/tests/libqtest.c b/tests/libqtest.c\nindex b9a1f18..a34d8c4 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -925,6 +925,54 @@ QDict *qmp(const char *fmt, ...)\n return response;\n }\n \n+void qmp_device_del(const char *id)\n+{\n+ QDict *response1, *response2, *event = NULL;\n+ char *cmd;\n+\n+ /*\n+ * device deletion will get one response and one event. E.g.:\n+ *\n+ * {'execute': 'device_del','arguments': { 'id': 'scsi-hd'}}\n+ *\n+ * will get this one:\n+ *\n+ * {\"timestamp\": {\"seconds\": 1505289667, \"microseconds\": 569862},\n+ * \"event\": \"DEVICE_DELETED\", \"data\": {\"device\": \"scsi-hd\",\n+ * \"path\": \"/machine/peripheral/scsi-hd\"}}\n+ *\n+ * and this one:\n+ *\n+ * {\"return\": {}}\n+ *\n+ * But the order of arrival may vary. Detect both.\n+ */\n+\n+ cmd = g_strdup_printf(\"{'execute': 'device_del',\"\n+ \" 'arguments': {\"\n+ \" 'id': '%s'\"\n+ \"}}\", id);\n+ response1 = qmp(cmd);\n+ g_free(cmd);\n+ g_assert(response1);\n+ g_assert(!qdict_haskey(response1, \"error\"));\n+\n+ response2 = qmp(\"\");\n+ g_assert(response2);\n+ g_assert(!qdict_haskey(response2, \"error\"));\n+\n+ if (qdict_haskey(response1, \"event\")) {\n+ event = response1;\n+ } else if (qdict_haskey(response2, \"event\")) {\n+ event = response2;\n+ }\n+ g_assert(event);\n+ g_assert(!strcmp(qdict_get_str(event, \"event\"), \"DEVICE_DELETED\"));\n+\n+ QDECREF(response1);\n+ QDECREF(response2);\n+}\n+\n void qmp_async(const char *fmt, ...)\n {\n va_list ap;\ndiff --git a/tests/libqtest.h b/tests/libqtest.h\nindex 3ae5709..0d48e4b 100644\n--- a/tests/libqtest.h\n+++ b/tests/libqtest.h\n@@ -920,6 +920,14 @@ QDict *qmp_fdv(int fd, const char *fmt, va_list ap);\n QDict *qmp_fd(int fd, const char *fmt, ...);\n \n /**\n+ * qmp_device_del:\n+ * @id: The device ID to be deleted\n+ *\n+ * Delete the device with ID @id from QMP interface.\n+ */\n+void qmp_device_del(const char *id);\n+\n+/**\n * qtest_cb_for_every_machine:\n * @cb: Pointer to the callback function\n *\n","prefixes":["1/4"]}