qos-test: es1370 test node
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 <e.emanuelegiuseppe@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
53bfb4290f
commit
7f4090a56d
|
@ -154,7 +154,6 @@ check-qtest-generic-y += tests/cdrom-test$(EXESUF)
|
||||||
check-qtest-pci-y += tests/e1000-test$(EXESUF)
|
check-qtest-pci-y += tests/e1000-test$(EXESUF)
|
||||||
check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-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_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
|
||||||
check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
|
|
||||||
check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-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_HDA) += tests/intel-hda-test$(EXESUF)
|
||||||
check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
||||||
|
@ -745,6 +744,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o
|
||||||
# Tests
|
# Tests
|
||||||
qos-test-obj-y += tests/ac97-test.o
|
qos-test-obj-y += tests/ac97-test.o
|
||||||
qos-test-obj-y += tests/e1000e-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/ipoctal232-test.o
|
||||||
qos-test-obj-y += tests/ne2000-test.o
|
qos-test-obj-y += tests/ne2000-test.o
|
||||||
qos-test-obj-y += tests/nvme-test.o
|
qos-test-obj-y += tests/nvme-test.o
|
||||||
|
@ -812,7 +812,6 @@ tests/device-plug-test$(EXESUF): tests/device-plug-test.o
|
||||||
tests/drive_del-test$(EXESUF): tests/drive_del-test.o
|
tests/drive_del-test$(EXESUF): tests/drive_del-test.o
|
||||||
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
||||||
tests/i82801b11-test$(EXESUF): tests/i82801b11-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/intel-hda-test$(EXESUF): tests/intel-hda-test.o
|
||||||
tests/ioh3420-test$(EXESUF): tests/ioh3420-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)
|
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
||||||
|
|
|
@ -9,23 +9,49 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "libqtest.h"
|
#include "libqtest.h"
|
||||||
|
#include "libqos/qgraph.h"
|
||||||
|
#include "libqos/pci.h"
|
||||||
|
|
||||||
/* Tests only initialization so far. TODO: Replace with functional tests */
|
typedef struct QES1370 QES1370;
|
||||||
static void nop(void)
|
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
fprintf(stderr, "%s not present in e1000e\n", interface);
|
||||||
{
|
g_assert_not_reached();
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
|
||||||
qtest_add_func("/es1370/nop", nop);
|
|
||||||
|
|
||||||
qtest_start("-device ES1370");
|
|
||||||
ret = g_test_run();
|
|
||||||
|
|
||||||
qtest_end();
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void *es1370_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
|
||||||
|
{
|
||||||
|
QES1370 *es1370 = g_new0(QES1370, 1);
|
||||||
|
QPCIBus *bus = pci_bus;
|
||||||
|
|
||||||
|
qpci_device_init(&es1370->dev, bus, addr);
|
||||||
|
es1370->obj.get_driver = es1370_get_driver;
|
||||||
|
|
||||||
|
return &es1370->obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void es1370_register_nodes(void)
|
||||||
|
{
|
||||||
|
QOSGraphEdgeOptions opts = {
|
||||||
|
.extra_device_opts = "addr=04.0",
|
||||||
|
};
|
||||||
|
add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
Loading…
Reference in New Issue