aboutsummaryrefslogtreecommitdiff
path: root/tests/megasas-test.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-11-29 11:35:13 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-07 17:28:47 +0100
commit469bb49b3e131b5f641939d4fa6a4b09e6da47f8 (patch)
tree0f303c3ff28a12e16a865d1ff82c9a66a6dbbb09 /tests/megasas-test.c
parenta138f26623e15ec721489f3164fbd7eb03a6dc98 (diff)
qos-test: megasas test node
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 <pbonzini@redhat.com>
Diffstat (limited to 'tests/megasas-test.c')
-rw-r--r--tests/megasas-test.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/tests/megasas-test.c b/tests/megasas-test.c
index 81837e14af..33aa97042c 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);