qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de
Subject: [Qemu-devel] [PATCH v4 3/4] virtio-blk-test.c: add hotplug subtest
Date: Fri,  6 Jun 2014 22:33:52 +0800	[thread overview]
Message-ID: <1402065233-31894-4-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1402065233-31894-1-git-send-email-akong@redhat.com>

This patch adds a new subtest, it hotplugs 29 * 8 = 232 virtio-blk
devices to guest, and try to hot-unplug them.

Note: the hot-unplug can't work without cooperation of guest OS.

Signed-off-by: Amos Kong <akong@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/virtio-blk-test.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index 0fdec01..7358203 100644
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -7,11 +7,41 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <stdio.h>
 #include <glib.h>
 #include <string.h>
 #include "libqtest.h"
 #include "qemu/osdep.h"
 
+static void test_blk_hotplug(void)
+{
+    int i, j;
+
+    /* start with no network/block device, slots 3~0x1f are free */
+    qtest_start("-net none");
+
+    for (i = 3; i <= 0x1f; i++) {
+        for (j = 7; j >= 0; j--) {
+            qmp_exec_hmp_cmd("OK\r\n",
+                             "drive_add 0 if=none,file=/dev/null,id=drv-%x.%x",
+                             i, j);
+            qmp_exec_hmp_cmd("",
+                       "device_add virtio-blk-pci,id=dev-%x.%x,drive=drv-%x.%x,"
+                       "addr=0x%x.%x,multifunction=on", i, j, i, j, i, j);
+        }
+    }
+
+    /* hot-unplug doesn't work without cooperation of guest OS */
+    for (i = 3; i <= 0x1f; i++) {
+        for (j = 7; j >= 0; j--) {
+            qmp_exec_hmp_cmd("", "drive_del drv-%x.%x", i, j);
+            qmp_exec_hmp_cmd("", "device_del dev-%x.%x", i, j);
+        }
+    }
+
+    qtest_end();
+}
+
 /* Tests only initialization */
 static void virtblk_init(void)
 {
@@ -26,6 +56,7 @@ int main(int argc, char **argv)
 
     g_test_init(&argc, &argv, NULL);
     qtest_add_func("/virtio/blk/pci/init", virtblk_init);
+    qtest_add_func("/virtio/blk/pci/hotplug", test_blk_hotplug);
 
     ret = g_test_run();
 
-- 
1.9.3

  parent reply	other threads:[~2014-06-06 14:34 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-06 14:33 [Qemu-devel] [PATCH v4 0/4] test virtio-blk hotplug Amos Kong
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 1/4] virtio-blk-test.c: change pci_nop() to virtblk_init() Amos Kong
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 2/4] qtest: introduce qmp_exec_hmp_cmd() Amos Kong
2014-06-17 13:16   ` Andreas Färber
2014-06-17 17:37   ` Paolo Bonzini
2014-06-18  6:29     ` Amos Kong
2014-06-18  7:05       ` Paolo Bonzini
2014-06-06 14:33 ` Amos Kong [this message]
2014-06-17 13:25   ` [Qemu-devel] [PATCH v4 3/4] virtio-blk-test.c: add hotplug subtest Andreas Färber
2014-06-18  6:40     ` Amos Kong
2014-06-18 10:26       ` Andreas Färber
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 4/4] qtest: use qmp_exec_hmp_cmd() in blockdev-test Amos Kong
2014-06-17 13:28   ` Andreas Färber
2014-06-09 13:22 ` [Qemu-devel] [PATCH v4 0/4] test virtio-blk hotplug Stefan Hajnoczi
2014-06-17 12:54   ` Amos Kong
2014-06-17 13:37     ` Andreas Färber
2014-06-18  2:58       ` Amos Kong
2014-06-18  3:04         ` Stefan Hajnoczi
2014-06-18  5:46         ` Amos Kong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402065233-31894-4-git-send-email-akong@redhat.com \
    --to=akong@redhat.com \
    --cc=afaerber@suse.de \
    --cc=arei.gonglei@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).