Commit 941e3317 authored by Emanuele Giuseppe Esposito's avatar Emanuele Giuseppe Esposito Committed by Paolo Bonzini
Browse files

qos-test: ne2k_pci test node 



Convert tests/ne2000-test to a driver node; currently it runs
the PCI nop test only, therefore we're not placing it in tests/libqos.

The actual device consumed by the test is ne2k_pci.

Signed-off-by: default avatarEmanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 31692b2e

tests/Makefile.include

+1 −2
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ check-qtest-pci-y += tests/e1000-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_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_VGA) += tests/display-vga-test$(EXESUF)
@@ -753,6 +752,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o 
qos-test-obj-y += tests/ac97-test.o

qos-test-obj-y += tests/e1000e-test.o

qos-test-obj-y += tests/ipoctal232-test.o

qos-test-obj-y += tests/ne2000-test.o

qos-test-obj-y += tests/pci-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)
@@ -805,7 +805,6 @@ tests/pcnet-test$(EXESUF): tests/pcnet-test.o 
tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o

tests/eepro100-test$(EXESUF): tests/eepro100-test.o

tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o

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/ne2000-test.c

+36 −10
Original line number Diff line number Diff line
@@ -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 pci_nop(void)

typedef struct QNe2k_pci QNe2k_pci;



struct QNe2k_pci {

    QOSGraphObject obj;

    QPCIDevice dev;

};



static void *ne2k_pci_get_driver(void *obj, const char *interface)

{

    QNe2k_pci *ne2k_pci = obj;



    if (!g_strcmp0(interface, "pci-device")) {

        return &ne2k_pci->dev;

    }



    fprintf(stderr, "%s not present in ne2k_pci\n", interface);

    g_assert_not_reached();

}



int main(int argc, char **argv)

static void *ne2k_pci_create(void *pci_bus, QGuestAllocator *alloc, void *addr)

{

    int ret;

    QNe2k_pci *ne2k_pci = g_new0(QNe2k_pci, 1);

    QPCIBus *bus = pci_bus;



    g_test_init(&argc, &argv, NULL);

    qtest_add_func("/ne2000/pci/nop", pci_nop);

    qpci_device_init(&ne2k_pci->dev, bus, addr);

    ne2k_pci->obj.get_driver = ne2k_pci_get_driver;



    qtest_start("-device ne2k_pci");

    ret = g_test_run();

    return &ne2k_pci->obj;

}



    qtest_end();

static void ne2000_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("ne2k_pci", ne2k_pci_create);

    qos_node_consumes("ne2k_pci", "pci-bus", &opts);

    qos_node_produces("ne2k_pci", "pci-device");

}



libqos_init(ne2000_register_nodes);