[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 68/71] qos-test: es1370 test node
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 68/71] qos-test: es1370 test node |
Date: |
Mon, 3 Dec 2018 16:33:21 +0100 |
From: Emanuele Giuseppe Esposito <address@hidden>
Convert tests/es1370-test to a driver node; currently it runs
the PCI nop test only, therefore we're not placing it in tests/libqos.
Signed-off-by: Emanuele Giuseppe Esposito <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/Makefile.include | 3 +--
tests/es1370-test.c | 46 ++++++++++++++++++++++++++++++++++++----------
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8995132..ee6871d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -144,7 +144,6 @@ check-qtest-generic-y += tests/cdrom-test$(EXESUF)
check-qtest-pci-y += tests/e1000-test$(EXESUF)
check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
-check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
check-qtest-pci-y += 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)
@@ -671,6 +670,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o
# Tests
qos-test-obj-y += tests/ac97-test.o
qos-test-obj-y += tests/e1000e-test.o
+qos-test-obj-y += tests/es1370-test.o
qos-test-obj-y += tests/ipoctal232-test.o
qos-test-obj-y += tests/ne2000-test.o
qos-test-obj-y += tests/nvme-test.o
@@ -736,7 +736,6 @@ tests/machine-none-test$(EXESUF): tests/machine-none-test.o
tests/drive_del-test$(EXESUF): tests/drive_del-test.o
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
-tests/es1370-test$(EXESUF): tests/es1370-test.o
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
diff --git a/tests/es1370-test.c b/tests/es1370-test.c
index 199fe19..d845cd0 100644
--- a/tests/es1370-test.c
+++ b/tests/es1370-test.c
@@ -9,23 +9,49 @@
#include "qemu/osdep.h"
#include "libqtest.h"
+#include "libqos/qgraph.h"
+#include "libqos/pci.h"
-/* Tests only initialization so far. TODO: Replace with functional tests */
-static void nop(void)
+typedef struct QES1370 QES1370;
+
+struct QES1370 {
+ QOSGraphObject obj;
+ QPCIDevice dev;
+};
+
+static void *es1370_get_driver(void *obj, const char *interface)
{
+ QES1370 *es1370 = obj;
+
+ if (!g_strcmp0(interface, "pci-device")) {
+ return &es1370->dev;
+ }
+
+ fprintf(stderr, "%s not present in e1000e\n", interface);
+ g_assert_not_reached();
}
-int main(int argc, char **argv)
+static void *es1370_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
{
- int ret;
+ QES1370 *es1370 = g_new0(QES1370, 1);
+ QPCIBus *bus = pci_bus;
- g_test_init(&argc, &argv, NULL);
- qtest_add_func("/es1370/nop", nop);
+ qpci_device_init(&es1370->dev, bus, addr);
+ es1370->obj.get_driver = es1370_get_driver;
- qtest_start("-device ES1370");
- ret = g_test_run();
+ return &es1370->obj;
+}
- qtest_end();
+static void es1370_register_nodes(void)
+{
+ QOSGraphEdgeOptions opts = {
+ .extra_device_opts = "addr=04.0",
+ };
+ add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });
- return ret;
+ qos_node_create_driver("ES1370", es1370_create);
+ qos_node_consumes("ES1370", "pci-bus", &opts);
+ qos_node_produces("ES1370", "pci-device");
}
+
+libqos_init(es1370_register_nodes);
--
1.8.3.1
- [Qemu-devel] [PATCH 57/71] tests/libqos: remove pre-qgraph QVirtioPCIDevice API, (continued)
- [Qemu-devel] [PATCH 57/71] tests/libqos: remove pre-qgraph QVirtioPCIDevice API, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 59/71] qos-test: ac97 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 60/71] qos-test: tpci200 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 61/71] qos-test: ipoctal232 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 62/71] qos-test: ne2k_pci test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 63/71] qos-test: nvme test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 65/71] qos-test: spapr-phb test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 64/71] qos-test: pcnet test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 66/71] qos-test: usb-hcd-ohci test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 67/71] qos-test: vmxnet3 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 68/71] qos-test: es1370 test node,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 69/71] qos-test: eepro100 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 70/71] qos-test: e1000 test node, Paolo Bonzini, 2018/12/03
- [Qemu-devel] [PATCH 71/71] qos-test: megasas test node, Paolo Bonzini, 2018/12/03
- Re: [Qemu-devel] [PATCH for-4.0 00/71] qtest: qgraph driver framework, no-reply, 2018/12/03
- Re: [Qemu-devel] [PATCH for-4.0 00/71] qtest: qgraph driver framework, Philippe Mathieu-Daudé, 2018/12/12
- Re: [Qemu-devel] [PATCH for-4.0 00/71] qtest: qgraph driver framework, Philippe Mathieu-Daudé, 2018/12/12