Commit 53bfb429 authored by Emanuele Giuseppe Esposito's avatar Emanuele Giuseppe Esposito Committed by Paolo Bonzini
Browse files

qos-test: vmxnet3 test node 



Convert tests/vmxnet3-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: default avatarEmanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fb7e0b48

tests/Makefile.include

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ check-qtest-i386-y += tests/drive_del-test$(EXESUF) 
check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)

check-qtest-i386-y += tests/tco-test$(EXESUF)

check-qtest-i386-y += $(check-qtest-pci-y)

check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)

check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)

check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)

check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
@@ -762,6 +761,7 @@ qos-test-obj-y += tests/virtio-net-test.o 
qos-test-obj-y += tests/virtio-rng-test.o

qos-test-obj-y += tests/virtio-scsi-test.o

qos-test-obj-y += tests/virtio-serial-test.o

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



check-unit-y += tests/test-qgraph$(EXESUF)

tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)
@@ -801,7 +801,6 @@ tests/e1000-test$(EXESUF): tests/e1000-test.o 
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)

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/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/vmxnet3-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 nop(void)

typedef struct QVmxnet3 QVmxnet3;



struct QVmxnet3 {

    QOSGraphObject obj;

    QPCIDevice dev;

};



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

{

    QVmxnet3 *vmxnet3 = obj;



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

        return &vmxnet3->dev;

    }



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

    g_assert_not_reached();

}



int main(int argc, char **argv)

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

{

    int ret;

    QVmxnet3 *vmxnet3 = g_new0(QVmxnet3, 1);

    QPCIBus *bus = pci_bus;



    g_test_init(&argc, &argv, NULL);

    qtest_add_func("/vmxnet3/nop", nop);

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

    vmxnet3->obj.get_driver = vmxnet3_get_driver;



    qtest_start("-device vmxnet3");

    ret = g_test_run();

    return &vmxnet3->obj;

}



    qtest_end();

static void vmxnet3_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("vmxnet3", vmxnet3_create);

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

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

}



libqos_init(vmxnet3_register_nodes);