[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 46/57] qos-test: tpci200 test node
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 46/57] qos-test: tpci200 test node |
Date: |
Thu, 7 Mar 2019 18:29:53 +0100 |
From: Emanuele Giuseppe Esposito <address@hidden>
Convert tests/tpci200-test to a driver node; currently it runs
the PCI nop test only, but it also produces the ipack interface.
Signed-off-by: Emanuele Giuseppe Esposito <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/Makefile.include | 3 +--
tests/libqos/tpci200.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/tpci200-test.c | 31 ------------------------
3 files changed, 66 insertions(+), 33 deletions(-)
create mode 100644 tests/libqos/tpci200.c
delete mode 100644 tests/tpci200-test.c
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 954b06b..905a361 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -160,7 +160,6 @@ check-qtest-pci-$(CONFIG_EEPRO100_PCI) +=
tests/eepro100-test$(EXESUF)
check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)
check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
-check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)
check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
@@ -731,6 +730,7 @@ qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y)
qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
qos-test-obj-y += tests/libqos/e1000e.o
qos-test-obj-y += tests/libqos/sdhci.o
+qos-test-obj-y += tests/libqos/tpci200.o
qos-test-obj-y += tests/libqos/virtio.o
qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o
qos-test-obj-y += tests/libqos/virtio-balloon.o
@@ -811,7 +811,6 @@ tests/ne2000-test$(EXESUF): tests/ne2000-test.o
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o
-tests/tpci200-test$(EXESUF): tests/tpci200-test.o
tests/display-vga-test$(EXESUF): tests/display-vga-test.o
tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
tests/qom-test$(EXESUF): tests/qom-test.o
diff --git a/tests/libqos/tpci200.c b/tests/libqos/tpci200.c
new file mode 100644
index 0000000..98dc532
--- /dev/null
+++ b/tests/libqos/tpci200.c
@@ -0,0 +1,65 @@
+/*
+ * QTest testcase for tpci200 PCI-IndustryPack bridge
+ *
+ * Copyright (c) 2014 SUSE LINUX Products GmbH
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "libqtest.h"
+#include "libqos/qgraph.h"
+#include "libqos/pci.h"
+
+typedef struct QTpci200 QTpci200;
+typedef struct QIpack QIpack;
+
+struct QIpack {
+
+};
+struct QTpci200 {
+ QOSGraphObject obj;
+ QPCIDevice dev;
+ QIpack ipack;
+};
+
+/* tpci200 */
+static void *tpci200_get_driver(void *obj, const char *interface)
+{
+ QTpci200 *tpci200 = obj;
+ if (!g_strcmp0(interface, "ipack")) {
+ return &tpci200->ipack;
+ }
+ if (!g_strcmp0(interface, "pci-device")) {
+ return &tpci200->dev;
+ }
+
+ fprintf(stderr, "%s not present in tpci200\n", interface);
+ g_assert_not_reached();
+}
+
+static void *tpci200_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
+{
+ QTpci200 *tpci200 = g_new0(QTpci200, 1);
+ QPCIBus *bus = pci_bus;
+
+ qpci_device_init(&tpci200->dev, bus, addr);
+ tpci200->obj.get_driver = tpci200_get_driver;
+ return &tpci200->obj;
+}
+
+static void tpci200_register_nodes(void)
+{
+ QOSGraphEdgeOptions opts = {
+ .extra_device_opts = "addr=04.0,id=ipack0",
+ };
+ add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });
+
+ qos_node_create_driver("tpci200", tpci200_create);
+ qos_node_consumes("tpci200", "pci-bus", &opts);
+ qos_node_produces("tpci200", "ipack");
+ qos_node_produces("tpci200", "pci-device");
+}
+
+libqos_init(tpci200_register_nodes);
diff --git a/tests/tpci200-test.c b/tests/tpci200-test.c
deleted file mode 100644
index 0321ec2..0000000
--- a/tests/tpci200-test.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * QTest testcase for tpci200 PCI-IndustryPack bridge
- *
- * Copyright (c) 2014 SUSE LINUX Products GmbH
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-#include "libqtest.h"
-
-/* Tests only initialization so far. TODO: Replace with functional tests */
-static void nop(void)
-{
-}
-
-int main(int argc, char **argv)
-{
- int ret;
-
- g_test_init(&argc, &argv, NULL);
- qtest_add_func("/tpci200/nop", nop);
-
- qtest_start("-device tpci200");
- ret = g_test_run();
-
- qtest_end();
-
- return ret;
-}
--
1.8.3.1
- [Qemu-devel] [PULL 35/57] qos-test: virtio-blk test node, (continued)
- [Qemu-devel] [PULL 35/57] qos-test: virtio-blk test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 41/57] tests/libqos: virtio-scsi driver and interface nodes, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 38/57] tests/libqos: support multiqueue for virtio-net, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 42/57] qos-test: virtio-scsi test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 40/57] qos-test: vhost-user test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 45/57] qos-test: ac97 test node, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 43/57] tests/libqos: remove pre-qgraph QVirtioPCIDevice API, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 44/57] tests: move virtio entirely to qos-test, Paolo Bonzini, 2019/03/07
- [Qemu-devel] [PULL 47/57] qos-test: ipoctal232 test node, Paolo Bonzini, 2019/03/07
- [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 <=
- [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, 2019/03/07
- Re: [Qemu-devel] [PULL 00/57] qgraph merge, Peter Maydell, 2019/03/08