[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/7] blockdev-test: add test case for drive_add d
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 5/7] blockdev-test: add test case for drive_add duplicate IDs |
Date: |
Wed, 30 Oct 2013 14:54:34 +0100 |
The following should work:
(qemu) drive_add if=none,id=drive0
(qemu) drive_del drive0
(qemu) drive_add if=none,id=drive0
Previous versions of QEMU produced a duplicate ID error because
drive_add leaked the options.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/Makefile | 2 ++
tests/blockdev-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 tests/blockdev-test.c
diff --git a/tests/Makefile b/tests/Makefile
index fa4c9f0..7863123 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -67,6 +67,7 @@ check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
+check-qtest-i386-y += tests/blockdev-test$(EXESUF)
check-qtest-x86_64-y = $(check-qtest-i386-y)
gcov-files-i386-y += i386-softmmu/hw/mc146818rtc.c
gcov-files-x86_64-y = $(subst
i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
@@ -174,6 +175,7 @@ tests/boot-order-test$(EXESUF): tests/boot-order-test.o
$(libqos-obj-y)
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
+tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y)
tests/qemu-iotests/socket_scm_helper$(EXESUF):
tests/qemu-iotests/socket_scm_helper.o
# QTest rules
diff --git a/tests/blockdev-test.c b/tests/blockdev-test.c
new file mode 100644
index 0000000..8b7371e
--- /dev/null
+++ b/tests/blockdev-test.c
@@ -0,0 +1,59 @@
+/*
+ * blockdev.c test cases
+ *
+ * Copyright (C) 2013 Red Hat Inc.
+ *
+ * Authors:
+ * Stefan Hajnoczi <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ */
+
+#include <glib.h>
+#include <string.h>
+#include "libqtest.h"
+
+static void test_drive_add_empty(void)
+{
+ QDict *response;
+ const char *response_return;
+
+ /* Start with an empty drive */
+ qtest_start("-drive if=none,id=drive0");
+
+ /* Delete the drive */
+ response = qmp("{\"execute\": \"human-monitor-command\","
+ " \"arguments\": {"
+ " \"command-line\": \"drive_del drive0\""
+ "}}");
+ g_assert(response);
+ response_return = qdict_get_try_str(response, "return");
+ g_assert(response_return);
+ g_assert(strcmp(response_return, "") == 0);
+ QDECREF(response);
+
+ /* Ensure re-adding the drive works - there should be no duplicate ID error
+ * because the old drive must be gone.
+ */
+ response = qmp("{\"execute\": \"human-monitor-command\","
+ " \"arguments\": {"
+ " \"command-line\": \"drive_add 0 if=none,id=drive0\""
+ "}}");
+ g_assert(response);
+ response_return = qdict_get_try_str(response, "return");
+ g_assert(response_return);
+ g_assert(strcmp(response_return, "OK\r\n") == 0);
+ QDECREF(response);
+
+ qtest_end();
+}
+
+int main(int argc, char **argv)
+{
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_add_func("/qdev/drive_add_empty", test_drive_add_empty);
+
+ return g_test_run();
+}
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/7] qdev and blockdev refcount leak fixes, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 3/7] libqtest: rename qmp() to qmp_discard_response(), Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 2/7] qdev: unref qdev when device_add fails, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 4/7] libqtest: add qmp(fmt, ...) -> QDict* function, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 1/7] blockdev: fix drive_init() opts and bs_opts leaks, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 5/7] blockdev-test: add test case for drive_add duplicate IDs,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 6/7] qdev-monitor-test: add device_add leak test cases, Stefan Hajnoczi, 2013/10/30
- [Qemu-devel] [PATCH v3 7/7] qdev: drop misleading qdev_free() function, Stefan Hajnoczi, 2013/10/30
- Re: [Qemu-devel] [PATCH v3 0/7] qdev and blockdev refcount leak fixes, Andreas Färber, 2013/10/30