qos-test: pcnet test node
Convert tests/pcnet-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
3157ed330e
commit
96900e1610
|
@ -153,7 +153,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_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_ES1370) += tests/es1370-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)
|
||||||
|
@ -754,6 +753,7 @@ 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
|
||||||
qos-test-obj-y += tests/pci-test.o
|
qos-test-obj-y += tests/pci-test.o
|
||||||
|
qos-test-obj-y += tests/pcnet-test.o
|
||||||
qos-test-obj-y += tests/sdhci-test.o
|
qos-test-obj-y += tests/sdhci-test.o
|
||||||
qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)
|
qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)
|
||||||
qos-test-obj-y += tests/virtio-test.o
|
qos-test-obj-y += tests/virtio-test.o
|
||||||
|
@ -801,7 +801,6 @@ tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y)
|
||||||
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
||||||
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
||||||
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
||||||
tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
|
||||||
tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
||||||
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
||||||
tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
||||||
|
|
|
@ -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 QPCNet QPCNet;
|
||||||
static void pci_nop(void)
|
|
||||||
|
struct QPCNet {
|
||||||
|
QOSGraphObject obj;
|
||||||
|
QPCIDevice dev;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void *pcnet_get_driver(void *obj, const char *interface)
|
||||||
{
|
{
|
||||||
|
QPCNet *pcnet = obj;
|
||||||
|
|
||||||
|
if (!g_strcmp0(interface, "pci-device")) {
|
||||||
|
return &pcnet->dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(stderr, "%s not present in pcnet\n", interface);
|
||||||
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
static void *pcnet_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
|
||||||
{
|
{
|
||||||
int ret;
|
QPCNet *pcnet = g_new0(QPCNet, 1);
|
||||||
|
QPCIBus *bus = pci_bus;
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
qpci_device_init(&pcnet->dev, bus, addr);
|
||||||
qtest_add_func("/pcnet/pci/nop", pci_nop);
|
pcnet->obj.get_driver = pcnet_get_driver;
|
||||||
|
|
||||||
qtest_start("-device pcnet");
|
return &pcnet->obj;
|
||||||
ret = g_test_run();
|
|
||||||
|
|
||||||
qtest_end();
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void pcnet_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("pcnet", pcnet_create);
|
||||||
|
qos_node_consumes("pcnet", "pci-bus", &opts);
|
||||||
|
qos_node_produces("pcnet", "pci-device");
|
||||||
|
}
|
||||||
|
|
||||||
|
libqos_init(pcnet_register_nodes);
|
||||||
|
|
Loading…
Reference in a new issue