|
 |
9ae3a8 |
From 470de5e13e415a5e218d80114676a10c7dcb52c1 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <470de5e13e415a5e218d80114676a10c7dcb52c1.1387288155.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <527da6c2ce2c09d0183aa8595fc95f136f61b6df.1387288155.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <527da6c2ce2c09d0183aa8595fc95f136f61b6df.1387288155.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 12 Dec 2013 16:21:26 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 6/8] blockdev-test: add test case for drive_add duplicate IDs
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386865288-1575-7-git-send-email-stefanha@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56260
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 6/8] blockdev-test: add test case for drive_add duplicate IDs
|
|
|
9ae3a8 |
Bugzilla: 1003773
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The following should work:
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
(qemu) drive_add if=none,id=drive0
|
|
|
9ae3a8 |
(qemu) drive_del drive0
|
|
|
9ae3a8 |
(qemu) drive_add if=none,id=drive0
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Previous versions of QEMU produced a duplicate ID error because
|
|
|
9ae3a8 |
drive_add leaked the options.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 7ceeedd016facf8d58e14a0d1417fa7225d71072)
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflicts:
|
|
|
9ae3a8 |
tests/Makefile
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Trivial conflicts because upstream has additional tests that change the
|
|
|
9ae3a8 |
diff context.
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/Makefile | 2 ++
|
|
|
9ae3a8 |
tests/blockdev-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 61 insertions(+)
|
|
|
9ae3a8 |
create mode 100644 tests/blockdev-test.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/Makefile | 2 ++
|
|
|
9ae3a8 |
tests/blockdev-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 61 insertions(+)
|
|
|
9ae3a8 |
create mode 100644 tests/blockdev-test.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/Makefile b/tests/Makefile
|
|
|
9ae3a8 |
index 394e029..91231e8 100644
|
|
|
9ae3a8 |
--- a/tests/Makefile
|
|
|
9ae3a8 |
+++ b/tests/Makefile
|
|
|
9ae3a8 |
@@ -58,6 +58,7 @@ check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
|
|
9ae3a8 |
+check-qtest-i386-y += tests/blockdev-test$(EXESUF)
|
|
|
9ae3a8 |
check-qtest-x86_64-y = $(check-qtest-i386-y)
|
|
|
9ae3a8 |
gcov-files-i386-y += i386-softmmu/hw/mc146818rtc.c
|
|
|
9ae3a8 |
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
|
|
|
9ae3a8 |
@@ -135,6 +136,7 @@ tests/boot-order-test$(EXESUF): tests/boot-order-test.o
|
|
|
9ae3a8 |
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
|
|
9ae3a8 |
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
+tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
# QTest rules
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/blockdev-test.c b/tests/blockdev-test.c
|
|
|
9ae3a8 |
new file mode 100644
|
|
|
9ae3a8 |
index 0000000..c940e00
|
|
|
9ae3a8 |
--- /dev/null
|
|
|
9ae3a8 |
+++ b/tests/blockdev-test.c
|
|
|
9ae3a8 |
@@ -0,0 +1,59 @@
|
|
|
9ae3a8 |
+/*
|
|
|
9ae3a8 |
+ * blockdev.c test cases
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * Copyright (C) 2013 Red Hat Inc.
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * Authors:
|
|
|
9ae3a8 |
+ * Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
9ae3a8 |
+ * See the COPYING.LIB file in the top-level directory.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+#include <glib.h>
|
|
|
9ae3a8 |
+#include <string.h>
|
|
|
9ae3a8 |
+#include "libqtest.h"
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+static void test_drive_add_empty(void)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ QDict *response;
|
|
|
9ae3a8 |
+ const char *response_return;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* Start with an empty drive */
|
|
|
9ae3a8 |
+ qtest_start("-drive if=none,id=drive0");
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* Delete the drive */
|
|
|
9ae3a8 |
+ response = qmp("{\"execute\": \"human-monitor-command\","
|
|
|
9ae3a8 |
+ " \"arguments\": {"
|
|
|
9ae3a8 |
+ " \"command-line\": \"drive_del drive0\""
|
|
|
9ae3a8 |
+ "}}");
|
|
|
9ae3a8 |
+ g_assert(response);
|
|
|
9ae3a8 |
+ response_return = qdict_get_try_str(response, "return");
|
|
|
9ae3a8 |
+ g_assert(response_return);
|
|
|
9ae3a8 |
+ g_assert(strcmp(response_return, "") == 0);
|
|
|
9ae3a8 |
+ QDECREF(response);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* Ensure re-adding the drive works - there should be no duplicate ID error
|
|
|
9ae3a8 |
+ * because the old drive must be gone.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ response = qmp("{\"execute\": \"human-monitor-command\","
|
|
|
9ae3a8 |
+ " \"arguments\": {"
|
|
|
9ae3a8 |
+ " \"command-line\": \"drive_add 0 if=none,id=drive0\""
|
|
|
9ae3a8 |
+ "}}");
|
|
|
9ae3a8 |
+ g_assert(response);
|
|
|
9ae3a8 |
+ response_return = qdict_get_try_str(response, "return");
|
|
|
9ae3a8 |
+ g_assert(response_return);
|
|
|
9ae3a8 |
+ g_assert(strcmp(response_return, "OK\r\n") == 0);
|
|
|
9ae3a8 |
+ QDECREF(response);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ qtest_end();
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+int main(int argc, char **argv)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ g_test_init(&argc, &argv, NULL);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ qtest_add_func("/qmp/drive_add_empty", test_drive_add_empty);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return g_test_run();
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|