To support hot-plugging tests with virtio-ccw later, the current
tests should become independent from PCI specific functions. Thus
let's add some proper wrapper function for virtio device hot-plugging
and -unplugging first.
It also seems like device unplugging works fine on ppc64 when using
the generic qtest_hot_unplug_device() function, so hot-unplugging
is now tested on ppc64, too.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
tests/Makefile.include | 4 ++--
tests/libqos/virtio.c | 27 +++++++++++++++++++++++++++
tests/libqos/virtio.h | 5 +++++
tests/virtio-net-test.c | 8 ++------
tests/virtio-rng-test.c | 9 +++------
5 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index ff2a551..e3acdff 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -751,8 +751,8 @@ tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y)
-tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y)
$(libqos-virtio-obj-y)
-tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y)
+tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-virtio-obj-y)
+tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-virtio-obj-y)
tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o
$(libqos-virtio-obj-y)
tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c
index 9880a69..87d2e65 100644
--- a/tests/libqos/virtio.c
+++ b/tests/libqos/virtio.c
@@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "libqos/virtio.h"
+#include "libqos/pci.h"
#include "standard-headers/linux/virtio_config.h"
#include "standard-headers/linux/virtio_ring.h"
@@ -339,3 +340,29 @@ void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t
idx)
/* vq->avail->used_event */
writew(vq->avail + 4 + (2 * vq->size), idx);
}
+
+void qvirtio_plug_device_test(const char *driver, const char *id,
+ uint8_t addr, const char *opts)
+{
+ const char *arch = qtest_get_arch();
+
+ if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64") ||
+ g_str_equal(arch, "ppc64")) {
+ qpci_plug_device_test(driver, id, addr, opts);
+ } else {
+ g_assert_not_reached();
+ }
+}
+
+void qvirtio_unplug_device_test(const char *id, uint8_t addr)
+{
+ const char *arch = qtest_get_arch();
+
+ if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64")) {
+ qpci_unplug_acpi_device_test(id, addr);
+ } else if (g_str_equal(arch, "ppc64")) {
+ qtest_hot_unplug_device(id);
+ } else {
+ g_assert_not_reached();
+ }
+}
diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h
index 8fbcd18..03e33d6 100644
--- a/tests/libqos/virtio.h
+++ b/tests/libqos/virtio.h
@@ -143,4 +143,9 @@ void qvirtqueue_kick(QVirtioDevice *d, QVirtQueue *vq,
uint32_t free_head);
bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_idx);
void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx);
+
+void qvirtio_plug_device_test(const char *driver, const char *id,
+ uint8_t addr, const char *opts);
+void qvirtio_unplug_device_test(const char *id, uint8_t addr);
+
#endif
diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index 635b942..49e733d 100644
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -241,15 +241,11 @@ static void pci_basic(gconstpointer data)
static void hotplug(void)
{
- const char *arch = qtest_get_arch();
-
qtest_start("-device virtio-net-pci");
- qpci_plug_device_test("virtio-net-pci", "net1", PCI_SLOT_HP, NULL);
+ qvirtio_plug_device_test("virtio-net", "net1", PCI_SLOT_HP, NULL);
- if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
- qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP);
- }
+ qvirtio_unplug_device_test("net1", PCI_SLOT_HP);
test_end();
}
diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c
index dcecf77..04c4279 100644
--- a/tests/virtio-rng-test.c
+++ b/tests/virtio-rng-test.c
@@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "libqos/pci.h"
+#include "libqos/virtio.h"
#define PCI_SLOT_HP 0x06
@@ -20,13 +21,9 @@ static void pci_nop(void)
static void hotplug(void)
{
- const char *arch = qtest_get_arch();
+ qvirtio_plug_device_test("virtio-rng-pci", "rng1", PCI_SLOT_HP, NULL);
- qpci_plug_device_test("virtio-rng-pci", "rng1", PCI_SLOT_HP, NULL);
-
- if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
- qpci_unplug_acpi_device_test("rng1", PCI_SLOT_HP);
- }
+ qvirtio_unplug_device_test("rng1", PCI_SLOT_HP);
}
int main(int argc, char **argv)
--
1.8.3.1
