qos-test: ac97 test node

Convert tests/ac97-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:
Emanuele Giuseppe Esposito 2018-08-17 12:01:59 +02:00 committed by Paolo Bonzini
parent 19e3d9795c
commit 86dc943f6e
2 changed files with 39 additions and 15 deletions

View File

@ -159,7 +159,6 @@ check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-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_NE2000_PCI) += tests/ne2000-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_NVME_PCI) += tests/nvme-test$(EXESUF)
check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-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) += tests/tpci200-test$(EXESUF)
check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y) check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
@ -754,6 +753,7 @@ qos-test-obj-y += tests/libqos/ppc64_pseries-machine.o
qos-test-obj-y += tests/libqos/x86_64_pc-machine.o 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/e1000e-test.o qos-test-obj-y += tests/e1000e-test.o
qos-test-obj-y += tests/pci-test.o qos-test-obj-y += tests/pci-test.o
qos-test-obj-y += tests/sdhci-test.o qos-test-obj-y += tests/sdhci-test.o
@ -822,7 +822,6 @@ tests/drive_del-test$(EXESUF): tests/drive_del-test.o
tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y) tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y)
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/ac97-test$(EXESUF): tests/ac97-test.o
tests/es1370-test$(EXESUF): tests/es1370-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

View File

@ -9,23 +9,48 @@
#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 QAC97 QAC97;
static void nop(void)
struct QAC97 {
QOSGraphObject obj;
QPCIDevice dev;
};
static void *ac97_get_driver(void *obj, const char *interface)
{ {
QAC97 *ac97 = obj;
if (!g_strcmp0(interface, "pci-device")) {
return &ac97->dev;
}
fprintf(stderr, "%s not present in e1000e\n", interface);
g_assert_not_reached();
} }
int main(int argc, char **argv) static void *ac97_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
{ {
int ret; QAC97 *ac97 = g_new0(QAC97, 1);
QPCIBus *bus = pci_bus;
g_test_init(&argc, &argv, NULL); qpci_device_init(&ac97->dev, bus, addr);
qtest_add_func("/ac97/nop", nop); ac97->obj.get_driver = ac97_get_driver;
return &ac97->obj;
qtest_start("-device AC97");
ret = g_test_run();
qtest_end();
return ret;
} }
static void ac97_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("AC97", ac97_create);
qos_node_produces("AC97", "pci-device");
qos_node_consumes("AC97", "pci-bus", &opts);
}
libqos_init(ac97_register_nodes);