[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/36] test: virtio-blk: check if hot-plug/unplug
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 06/36] test: virtio-blk: check if hot-plug/unplug works |
Date: |
Fri, 26 Sep 2014 09:28:11 +0000 |
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
moved code duplication into library
---
tests/virtio-blk-test.c | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 38 insertions(+), 11 deletions(-)
diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index 588666c..d93224b 100644
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -45,6 +45,8 @@
#define PCI_SLOT 0x04
#define PCI_FN 0x00
+#define PCI_SLOT_HP 0x06
+
typedef struct QVirtioBlkReq {
uint32_t type;
uint32_t ioprio;
@@ -55,7 +57,7 @@ typedef struct QVirtioBlkReq {
static QPCIBus *test_start(void)
{
- char cmdline[100];
+ char *cmdline;
char tmp_path[] = "/tmp/qtest.XXXXXX";
int fd, ret;
@@ -66,11 +68,14 @@ static QPCIBus *test_start(void)
g_assert_cmpint(ret, ==, 0);
close(fd);
- snprintf(cmdline, 100, "-drive if=none,id=drive0,file=%s "
- "-device virtio-blk-pci,drive=drive0,addr=%x.%x",
- tmp_path, PCI_SLOT, PCI_FN);
+ cmdline = g_strdup_printf("-drive if=none,id=drive0,file=%s "
+ "-drive if=none,id=drive1,file=/dev/null "
+ "-device virtio-blk-pci,id=drv0,drive=drive0,"
+ "addr=%x.%x",
+ tmp_path, PCI_SLOT, PCI_FN);
qtest_start(cmdline);
unlink(tmp_path);
+ g_free(cmdline);
return qpci_init_pc();
}
@@ -80,14 +85,14 @@ static void test_end(void)
qtest_end();
}
-static QVirtioPCIDevice *virtio_blk_init(QPCIBus *bus)
+static QVirtioPCIDevice *virtio_blk_init(QPCIBus *bus, int slot)
{
QVirtioPCIDevice *dev;
dev = qvirtio_pci_device_find(bus, QVIRTIO_BLK_DEVICE_ID);
g_assert(dev != NULL);
g_assert_cmphex(dev->vdev.device_type, ==, QVIRTIO_BLK_DEVICE_ID);
- g_assert_cmphex(dev->pdev->devfn, ==, ((PCI_SLOT << 3) | PCI_FN));
+ g_assert_cmphex(dev->pdev->devfn, ==, ((slot << 3) | PCI_FN));
qvirtio_pci_device_enable(dev);
qvirtio_reset(&qvirtio_pci, &dev->vdev);
@@ -147,7 +152,7 @@ static void pci_basic(void)
bus = test_start();
- dev = virtio_blk_init(bus);
+ dev = virtio_blk_init(bus, PCI_SLOT);
/* MSI-X is not enabled */
addr = dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX;
@@ -293,7 +298,7 @@ static void pci_indirect(void)
bus = test_start();
- dev = virtio_blk_init(bus);
+ dev = virtio_blk_init(bus, PCI_SLOT);
/* MSI-X is not enabled */
addr = dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX;
@@ -384,7 +389,7 @@ static void pci_config(void)
bus = test_start();
- dev = virtio_blk_init(bus);
+ dev = virtio_blk_init(bus, PCI_SLOT);
/* MSI-X is not enabled */
addr = dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX;
@@ -426,7 +431,7 @@ static void pci_msix(void)
bus = test_start();
alloc = pc_alloc_init();
- dev = virtio_blk_init(bus);
+ dev = virtio_blk_init(bus, PCI_SLOT);
qpci_msix_enable(dev->pdev);
qvirtio_pci_set_msix_configuration_vector(dev, alloc, 0);
@@ -536,7 +541,7 @@ static void pci_idx(void)
bus = test_start();
alloc = pc_alloc_init();
- dev = virtio_blk_init(bus);
+ dev = virtio_blk_init(bus, PCI_SLOT);
qpci_msix_enable(dev->pdev);
qvirtio_pci_set_msix_configuration_vector(dev, alloc, 0);
@@ -640,6 +645,27 @@ static void pci_idx(void)
test_end();
}
+static void hotplug(void)
+{
+ QPCIBus *bus;
+ QVirtioPCIDevice *dev;
+
+ bus = test_start();
+
+ /* plug secondary disk */
+ qpci_plug_device_test("virtio-blk-pci", "drv1", PCI_SLOT_HP,
+ "'drive': 'drive1'");
+
+ dev = virtio_blk_init(bus, PCI_SLOT_HP);
+ g_assert(dev);
+ qvirtio_pci_device_disable(dev);
+ g_free(dev);
+
+ /* unplug secondary disk */
+ qpci_unplug_acpi_device_test("drv1", PCI_SLOT_HP);
+ test_end();
+}
+
int main(int argc, char **argv)
{
int ret;
@@ -651,6 +677,7 @@ int main(int argc, char **argv)
g_test_add_func("/virtio/blk/pci/config", pci_config);
g_test_add_func("/virtio/blk/pci/msix", pci_msix);
g_test_add_func("/virtio/blk/pci/idx", pci_idx);
+ g_test_add_func("/virtio/blk/pci/hotplug", hotplug);
ret = g_test_run();
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/36] complete conversion to hotplug-handler API, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 01/36] test: virtio-scsi: check if hot-plug/unplug works, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 02/36] test: virtio-serial: check if hot-plug/unplug works, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 03/36] test: libqos: add qpci_plug_device_test() and qpci_unplug_acpi_device_test(), Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 04/36] test: virtio-rng: check if hot-plug/unplug works, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 05/36] test: virtio-net: check if hot-plug/unplug works, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 06/36] test: virtio-blk: check if hot-plug/unplug works,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 07/36] test: usb: move uhci port test code to libqos/usb.c, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 08/36] test: usb: add port test to uhci unit test, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 09/36] test: usb: generic usb device hotplug, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 10/36] test: usb: usb-storage hotplug test, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 12/36] access BusState.allow_hotplug using wraper qbus_is_hotpluggable(), Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 13/36] qdev: do not allow to instantiate non hotpluggable device with device_add, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 14/36] qdev: HotplugHandler: rename unplug callback to unplug_request, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 15/36] qdev: HotplugHandler: provide unplug callback, Igor Mammedov, 2014/09/26