Commit 0793a889 authored by Emanuele Giuseppe Esposito's avatar Emanuele Giuseppe Esposito Committed by Paolo Bonzini
Browse files

qos-test: tpci200 test node 



Convert tests/tpci200-test to a driver node; currently it runs
the PCI nop test only, but it also produces the ipack interface.

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

tests/Makefile.include

+1 −2
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 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_IPACK) += tests/tpci200-test$(EXESUF)

check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)

check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)

check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
@@ -731,6 +730,7 @@ qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) 
qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

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

qos-test-obj-y += tests/libqos/sdhci.o

qos-test-obj-y += tests/libqos/tpci200.o

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

qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o

qos-test-obj-y += tests/libqos/virtio-balloon.o
@@ -811,7 +811,6 @@ 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/tpci200-test$(EXESUF): tests/tpci200-test.o

tests/display-vga-test$(EXESUF): tests/display-vga-test.o

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

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

tests/libqos/tpci200.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 * QTest testcase for tpci200 PCI-IndustryPack bridge

 *

 * Copyright (c) 2014 SUSE LINUX Products GmbH

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "libqtest.h"

#include "libqos/qgraph.h"

#include "libqos/pci.h"



typedef struct QTpci200 QTpci200;

typedef struct QIpack QIpack;



struct QIpack {



};

struct QTpci200 {

    QOSGraphObject obj;

    QPCIDevice dev;

    QIpack ipack;

};



/* tpci200 */

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

{

    QTpci200 *tpci200 = obj;

    if (!g_strcmp0(interface, "ipack")) {

        return &tpci200->ipack;

    }

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

        return &tpci200->dev;

    }



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

    g_assert_not_reached();

}



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

{

    QTpci200 *tpci200 = g_new0(QTpci200, 1);

    QPCIBus *bus = pci_bus;



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

    tpci200->obj.get_driver = tpci200_get_driver;

    return &tpci200->obj;

}



static void tpci200_register_nodes(void)

{

    QOSGraphEdgeOptions opts = {

        .extra_device_opts = "addr=04.0,id=ipack0",

    };

    add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });



    qos_node_create_driver("tpci200", tpci200_create);

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

    qos_node_produces("tpci200", "ipack");

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

}



libqos_init(tpci200_register_nodes);

tests/tpci200-test.c

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * QTest testcase for tpci200 PCI-IndustryPack bridge

 *

 * Copyright (c) 2014 SUSE LINUX Products GmbH

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "libqtest.h"



/* Tests only initialization so far. TODO: Replace with functional tests */

static void nop(void)

{

}



int main(int argc, char **argv)

{

    int ret;



    g_test_init(&argc, &argv, NULL);

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



    qtest_start("-device tpci200");

    ret = g_test_run();



    qtest_end();



    return ret;

}