| Message ID | 1403108653-26765-5-git-send-email-akong@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 19, 2014 at 12:24:13AM +0800, Amos Kong wrote: > + 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); > + } Why is only drv-%x.0 deleted? Previous revisions of this patch series deleted all drives. Stefan
On Thu, Jun 19, 2014 at 11:49:08AM +0800, Stefan Hajnoczi wrote: > On Thu, Jun 19, 2014 at 12:24:13AM +0800, Amos Kong wrote: > > + 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); > > + } > > Why is only drv-%x.0 deleted? Previous revisions of this patch series > deleted all drives. Hot-unplug any single function, all functions in the slot will be removed. So once is enough. > Stefan
Hi, > -----Original Message----- > From: Amos Kong [mailto:akong@redhat.com] > Sent: Thursday, June 19, 2014 11:58 AM > To: Stefan Hajnoczi > Cc: qemu-devel@nongnu.org; Gonglei (Arei); afaerber@suse.de; > pbonzini@redhat.com; kwolf@redhat.com > Subject: Re: [PATCH v5 4/4] virtio-blk-test.c: add hotplug subtest > > On Thu, Jun 19, 2014 at 11:49:08AM +0800, Stefan Hajnoczi wrote: > > On Thu, Jun 19, 2014 at 12:24:13AM +0800, Amos Kong wrote: > > > + 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); > > > + } > > > > Why is only drv-%x.0 deleted? Previous revisions of this patch series > > deleted all drives. > > Hot-unplug any single function, all functions in the slot will be > removed. So once is enough. > IMHO, the below devices as the same as the drive about multifunction hot-unplug, right? Best regards, -Gonglei
On Thu, Jun 19, 2014 at 04:03:28AM +0000, Gonglei (Arei) wrote: > Hi, > > > -----Original Message----- > > From: Amos Kong [mailto:akong@redhat.com] > > Sent: Thursday, June 19, 2014 11:58 AM > > To: Stefan Hajnoczi > > Cc: qemu-devel@nongnu.org; Gonglei (Arei); afaerber@suse.de; > > pbonzini@redhat.com; kwolf@redhat.com > > Subject: Re: [PATCH v5 4/4] virtio-blk-test.c: add hotplug subtest > > > > On Thu, Jun 19, 2014 at 11:49:08AM +0800, Stefan Hajnoczi wrote: > > > On Thu, Jun 19, 2014 at 12:24:13AM +0800, Amos Kong wrote: > > > > + 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); > > > > + } > > > > > > Why is only drv-%x.0 deleted? Previous revisions of this patch series > > > deleted all drives. > > > > Hot-unplug any single function, all functions in the slot will be > > removed. So once is enough. > > > IMHO, the below devices as the same as the drive about multifunction hot-unplug, right? I'm wrong. drive should be hot-unplugged one by one, device will be removed by slot. PCI device has multifunction feature, not drive. > Best regards, > -Gonglei
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();
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(+)