From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjR-0004y4-Gf for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZhjL-0003Uw-6P for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjK-0003Uj-Te for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:43 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s92EpfGs022285 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 2 Oct 2014 10:51:42 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:36 +0200 Message-Id: <1412261496-24455-7-git-send-email-armbru@redhat.com> In-Reply-To: <1412261496-24455-1-git-send-email-armbru@redhat.com> References: <1412261496-24455-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] blockdev-test: Test device_del after drive_del List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com Executed in this order, drive_del and device_del's automatic drive deletion take notoriously tricky special paths. Signed-off-by: Markus Armbruster --- tests/drive_del-test.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 463479d..9ac3d48 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -40,6 +40,19 @@ static void drive_del(void) QDECREF(response); } +static void device_del(void) +{ + QDict *response; + + /* Complication: ignore DEVICE_DELETED event */ + qmp_discard_response("{'execute': 'device_del'," + " 'arguments': { 'id': 'dev0' } }"); + response = qmp_receive(); + g_assert(response); + g_assert(qdict_haskey(response, "return")); + QDECREF(response); +} + static void test_drive_without_dev(void) { /* Start with an empty drive */ @@ -87,6 +100,23 @@ static void test_after_failed_device_add(void) qtest_end(); } +static void test_drive_del_device_del(void) +{ + /* Start with a drive used by an device that unplugs instantaneously */ + qtest_start("-drive if=none,id=drive0,file=/dev/null" + " -device virtio-scsi-pci" + " -device scsi-hd,drive=drive0,id=dev0"); + + /* + * Delete the drive, and then the device + * Doing it in this order takes notoriously tricky special paths + */ + drive_del(); + device_del(); + + qtest_end(); +} + int main(int argc, char **argv) { const char *arch = qtest_get_arch(); @@ -99,6 +129,8 @@ int main(int argc, char **argv) if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) { qtest_add_func("/drive_del/after_failed_device_add", test_after_failed_device_add); + qtest_add_func("/blockdev/drive_del_device_del", + test_drive_del_device_del); } return g_test_run(); -- 1.9.3