cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-blockdev-test-add-test-case-for-drive_add-duplicate-.patch

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