[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/23] blockdev-test: Test device_del after drive_del
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 23/23] blockdev-test: Test device_del after drive_del |
Date: |
Sat, 4 Oct 2014 21:24:49 +0100 |
From: Markus Armbruster <address@hidden>
Executed in this order, drive_del and device_del's automatic drive
deletion take notoriously tricky special paths.
[Fixed "an device" -> "a device" typo as requested by Eric Blake.
--Stefan]
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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 38f8229..53fa969 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 a 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
- Re: [Qemu-devel] [PULL 13/23] q35/ahci: Pick up -cdrom and -hda options, (continued)
- [Qemu-devel] [PULL 14/23] util: Emancipate id_wellformed() from QemuOpts, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 15/23] iotests: Use _img_info, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 17/23] iotests: qemu-img info output for corrupt image, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 16/23] qapi: Add corrupt field to ImageInfoSpecificQCow2, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 18/23] drive_del-test: Merge of qdev-monitor-test, blockdev-test, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 19/23] blockdev-test: Use single rather than double quotes in QMP, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 20/23] blockdev-test: Clean up bogus drive_add argument, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmpstr(), Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 22/23] blockdev-test: Factor out some common code into helpers, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 23/23] blockdev-test: Test device_del after drive_del,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 00/23] Block patches, Peter Maydell, 2014/10/06