[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 57/57] qos-test: megasas test node
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 57/57] qos-test: megasas test node |
Date: |
Thu, 7 Mar 2019 18:30:04 +0100 |
Convert tests/megasas-test to a driver node; the code to discover the PCI
device is replaced by generic qgraph code.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/Makefile.include | 3 +-
tests/megasas-test.c | 80 +++++++++++++++++++++++++-------------------------
2 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5bc6d63..44af415 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -155,7 +155,6 @@ check-qtest-pci-$(CONFIG_RTL8139_PCI) +=
tests/rtl8139-test$(EXESUF)
check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
-check-qtest-pci-$(CONFIG_MEGASAS_SCSI_PCI) += tests/megasas-test$(EXESUF)
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
@@ -746,6 +745,7 @@ qos-test-obj-y += tests/e1000e-test.o
qos-test-obj-y += tests/eepro100-test.o
qos-test-obj-y += tests/es1370-test.o
qos-test-obj-y += tests/ipoctal232-test.o
+qos-test-obj-y += tests/megasas-test.o
qos-test-obj-y += tests/ne2000-test.o
qos-test-obj-y += tests/nvme-test.o
qos-test-obj-y += tests/pci-test.o
@@ -827,7 +827,6 @@ tests/test-filter-mirror$(EXESUF):
tests/test-filter-mirror.o $(qtest-obj-y)
tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o
$(qtest-obj-y)
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o
$(qtest-obj-y)
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o
contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
-tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y)
$(libqos-pc-obj-y)
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y)
libvhost-user.a
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
diff --git a/tests/megasas-test.c b/tests/megasas-test.c
index 81837e1..33aa970 100644
--- a/tests/megasas-test.c
+++ b/tests/megasas-test.c
@@ -10,55 +10,49 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/bswap.h"
-#include "libqos/libqos-pc.h"
-#include "libqos/libqos-spapr.h"
+#include "libqos/qgraph.h"
+#include "libqos/pci.h"
-static QOSState *qmegasas_start(const char *extra_opts)
+typedef struct QMegasas QMegasas;
+
+struct QMegasas {
+ QOSGraphObject obj;
+ QPCIDevice dev;
+};
+
+static void *megasas_get_driver(void *obj, const char *interface)
{
- QOSState *qs;
- const char *arch = qtest_get_arch();
- const char *cmd = "-drive id=hd0,if=none,file=null-co://,format=raw "
- "-device megasas,id=scsi0,addr=04.0 "
- "-device scsi-hd,bus=scsi0.0,drive=hd0 %s";
-
- if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
- qs = qtest_pc_boot(cmd, extra_opts ? : "");
- global_qtest = qs->qts;
- return qs;
+ QMegasas *megasas = obj;
+
+ if (!g_strcmp0(interface, "pci-device")) {
+ return &megasas->dev;
}
- g_printerr("virtio-scsi tests are only available on x86 or ppc64\n");
- exit(EXIT_FAILURE);
+ fprintf(stderr, "%s not present in megasas\n", interface);
+ g_assert_not_reached();
}
-static void qmegasas_stop(QOSState *qs)
+static void *megasas_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
{
- qtest_shutdown(qs);
-}
+ QMegasas *megasas = g_new0(QMegasas, 1);
+ QPCIBus *bus = pci_bus;
-/* Tests only initialization so far. TODO: Replace with functional tests */
-static void pci_nop(void)
-{
- QOSState *qs;
+ qpci_device_init(&megasas->dev, bus, addr);
+ megasas->obj.get_driver = megasas_get_driver;
- qs = qmegasas_start(NULL);
- qmegasas_stop(qs);
+ return &megasas->obj;
}
/* This used to cause a NULL pointer dereference. */
-static void megasas_pd_get_info_fuzz(void)
+static void megasas_pd_get_info_fuzz(void *obj, void *data, QGuestAllocator
*alloc)
{
- QPCIDevice *dev;
- QOSState *qs;
+ QMegasas *megasas = obj;
+ QPCIDevice *dev = &megasas->dev;
QPCIBar bar;
uint32_t context[256];
uint64_t context_pa;
int i;
- qs = qmegasas_start(NULL);
- dev = qpci_device_find(qs->pcibus, QPCI_DEVFN(4,0));
- g_assert(dev != NULL);
-
qpci_device_enable(dev);
bar = qpci_iomap(dev, 0, NULL);
@@ -71,19 +65,25 @@ static void megasas_pd_get_info_fuzz(void)
context[6] = cpu_to_le32(0x02020000);
context[7] = cpu_to_le32(0);
- context_pa = qmalloc(qs, sizeof(context));
+ context_pa = guest_alloc(alloc, sizeof(context));
memwrite(context_pa, context, sizeof(context));
qpci_io_writel(dev, bar, 0x40, context_pa);
-
- g_free(dev);
- qmegasas_stop(qs);
}
-int main(int argc, char **argv)
+static void megasas_register_nodes(void)
{
- g_test_init(&argc, &argv, NULL);
- qtest_add_func("/megasas/pci/nop", pci_nop);
- qtest_add_func("/megasas/dcmd/pd-get-info/fuzz", megasas_pd_get_info_fuzz);
+ QOSGraphEdgeOptions opts = {
+ .extra_device_opts = "addr=04.0,id=scsi0",
+ .before_cmd_line = "-drive id=drv0,if=none,file=null-co://,format=raw",
+ .after_cmd_line = "-device scsi-hd,bus=scsi0.0,drive=drv0",
+ };
+
+ add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });
+
+ qos_node_create_driver("megasas", megasas_create);
+ qos_node_consumes("megasas", "pci-bus", &opts);
+ qos_node_produces("megasas", "pci-device");
- return g_test_run();
+ qos_add_test("dcmd/pd-get-info/fuzz", "megasas", megasas_pd_get_info_fuzz,
NULL);
}
+libqos_init(megasas_register_nodes);
--
1.8.3.1
- [Qemu-devel] [PULL 48/57] qos-test: ne2k_pci test node, (continued)
- [Qemu-devel] [PULL 48/57] qos-test: ne2k_pci test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 46/57] qos-test: tpci200 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 49/57] qos-test: nvme test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 50/57] qos-test: pcnet test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 52/57] qos-test: usb-hcd-ohci test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 54/57] qos-test: es1370 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 53/57] qos-test: vmxnet3 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 51/57] qos-test: spapr-phb test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 56/57] qos-test: e1000 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 55/57] qos-test: eepro100 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 57/57] qos-test: megasas test node,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/57] qgraph merge, Peter Maydell, 2019/03/08