From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@gmail.com, arei.gonglei@huawei.com,
afaerber@suse.de, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v5 4/4] virtio-blk-test.c: add hotplug subtest
Date: Thu, 19 Jun 2014 00:24:13 +0800 [thread overview]
Message-ID: <1403108653-26765-5-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1403108653-26765-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>
---
tests/virtio-blk-test.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index 0fdec01..77817ca 100644
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -7,11 +7,78 @@
* 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"
+
+/* start with no network/block device, slots 3 to 0x1f are free */
+#define MIN_PCI_SLOT 3
+#define MAX_PCI_SLOT 0x1f
+#define MAX_PCI_FUNC 7
+
+static void test_blk_hotplug(void)
+{
+ QDict *response;
+ int i, j;
+ char drive_id[10];
+ char device_id[10];
+ char addr[10];
+
+ qtest_start("-net none");
+
+ for (i = MIN_PCI_SLOT; i <= MAX_PCI_SLOT; i++) {
+ for (j = MAX_PCI_FUNC; j >= 0; j--) {
+ sprintf(drive_id, "drv-%x.%x", i, j);
+ response = qmp("{ 'execute': 'blockdev-add',"
+ " 'arguments': {"
+ " 'options': {"
+ " 'driver': 'file',"
+ " 'filename': '/dev/null',"
+ " 'id': %s"
+ "} } }", drive_id);
+ g_assert(response);
+ g_assert(!qdict_haskey(response, "error"));
+ QDECREF(response);
+
+ sprintf(device_id, "dev-%x.%x", i, j);
+ sprintf(addr, "0x%x.%x", i, j);
+ response = qmp("{'execute': 'device_add',"
+ " 'arguments': {"
+ " 'driver': 'virtio-blk-pci',"
+ " 'drive': %s,"
+ " 'id': %s,"
+ " 'addr': %s,"
+ " 'multifunction': 'on'"
+ "} }", drive_id, device_id, addr);
+ g_assert(response);
+ g_assert(!qdict_haskey(response, "error"));
+ QDECREF(response);
+ }
+ }
+
+ /* hot-unplug doesn't work without cooperation of guest OS */
+ for (i = MIN_PCI_SLOT; i <= MAX_PCI_SLOT; i++) {
+ for (j = MAX_PCI_FUNC; j >= 0; j--) {
+ if (j == MAX_PCI_FUNC) {
+ qmp_exec_hmp_cmd("", "drive_del drv-%x.%x", i, 0);
+ }
+ sprintf(device_id, "dev-%x.%x", i, j);
+ response = qmp("{'execute': 'device_del',"
+ " 'arguments': {"
+ " 'id': %s"
+ "} }", device_id);
+ g_assert(response);
+ g_assert(!qdict_haskey(response, "error"));
+ QDECREF(response);
+ }
+ }
+
+ qtest_end();
+}
+
/* Tests only initialization */
static void virtblk_init(void)
{
@@ -26,6 +93,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
next prev parent reply other threads:[~2014-06-18 16:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 16:24 [Qemu-devel] [PATCH v5 0/4] test virtio-blk hotplug Amos Kong
2014-06-18 16:24 ` [Qemu-devel] [PATCH v5 1/4] qtest: introduce qmp_exec_hmp_cmd() Amos Kong
2014-06-18 16:24 ` [Qemu-devel] [PATCH v5 2/4] qtest: use qmp_exec_hmp_cmd() in blockdev-test Amos Kong
2014-06-18 16:24 ` [Qemu-devel] [PATCH v5 3/4] virtio-blk-test.c: change pci_nop() to virtblk_init() Amos Kong
2014-06-18 16:43 ` Andreas Färber
2014-06-19 4:41 ` Amos Kong
2014-06-18 16:24 ` Amos Kong [this message]
2014-06-19 3:49 ` [Qemu-devel] [PATCH v5 4/4] virtio-blk-test.c: add hotplug subtest Stefan Hajnoczi
2014-06-19 3:57 ` Amos Kong
2014-06-19 4:03 ` Gonglei (Arei)
2014-06-19 4:38 ` 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=1403108653-26765-5-git-send-email-akong@redhat.com \
--to=akong@redhat.com \
--cc=afaerber@suse.de \
--cc=arei.gonglei@huawei.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.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).