qos-test: e1000 test node
Convert tests/e1000-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
0b47730234
commit
a138f26623
@ -151,7 +151,6 @@ check-qtest-generic-y += tests/qmp-cmd-test$(EXESUF)
|
||||
check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
|
||||
check-qtest-generic-y += tests/cdrom-test$(EXESUF)
|
||||
|
||||
check-qtest-pci-y += tests/e1000-test$(EXESUF)
|
||||
check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
|
||||
check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
|
||||
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
|
||||
@ -742,6 +741,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o
|
||||
|
||||
# Tests
|
||||
qos-test-obj-y += tests/ac97-test.o
|
||||
qos-test-obj-y += tests/e1000-test.o
|
||||
qos-test-obj-y += tests/e1000e-test.o
|
||||
qos-test-obj-y += tests/eepro100-test.o
|
||||
qos-test-obj-y += tests/es1370-test.o
|
||||
@ -797,7 +797,6 @@ tests/m25p80-test$(EXESUF): tests/m25p80-test.o
|
||||
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
||||
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/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/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
|
||||
|
@ -9,22 +9,15 @@
|
||||
|
||||
#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 test_device(gconstpointer data)
|
||||
{
|
||||
const char *model = data;
|
||||
QTestState *s;
|
||||
char *args;
|
||||
typedef struct QE1000 QE1000;
|
||||
|
||||
args = g_strdup_printf("-device %s", model);
|
||||
s = qtest_start(args);
|
||||
|
||||
if (s) {
|
||||
qtest_quit(s);
|
||||
}
|
||||
g_free(args);
|
||||
}
|
||||
struct QE1000 {
|
||||
QOSGraphObject obj;
|
||||
QPCIDevice dev;
|
||||
};
|
||||
|
||||
static const char *models[] = {
|
||||
"e1000",
|
||||
@ -33,19 +26,42 @@ static const char *models[] = {
|
||||
"e1000-82545em",
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
static void *e1000_get_driver(void *obj, const char *interface)
|
||||
{
|
||||
QE1000 *e1000 = obj;
|
||||
|
||||
if (!g_strcmp0(interface, "pci-device")) {
|
||||
return &e1000->dev;
|
||||
}
|
||||
|
||||
fprintf(stderr, "%s not present in e1000e\n", interface);
|
||||
g_assert_not_reached();
|
||||
}
|
||||
|
||||
static void *e1000_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
|
||||
{
|
||||
QE1000 *e1000 = g_new0(QE1000, 1);
|
||||
QPCIBus *bus = pci_bus;
|
||||
|
||||
qpci_device_init(&e1000->dev, bus, addr);
|
||||
e1000->obj.get_driver = e1000_get_driver;
|
||||
|
||||
return &e1000->obj;
|
||||
}
|
||||
|
||||
static void e1000_register_nodes(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
QOSGraphEdgeOptions opts = {
|
||||
.extra_device_opts = "addr=04.0",
|
||||
};
|
||||
add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(models); i++) {
|
||||
char *path;
|
||||
|
||||
path = g_strdup_printf("e1000/%s", models[i]);
|
||||
qtest_add_data_func(path, models[i], test_device);
|
||||
g_free(path);
|
||||
qos_node_create_driver(models[i], e1000_create);
|
||||
qos_node_consumes(models[i], "pci-bus", &opts);
|
||||
qos_node_produces(models[i], "pci-device");
|
||||
}
|
||||
}
|
||||
|
||||
return g_test_run();
|
||||
}
|
||||
libqos_init(e1000_register_nodes);
|
||||
|
Loading…
Reference in New Issue
Block a user