This adds PCI init code and a basic test that checks the device config
matches what is passed on the command line.
Signed-off-by: Greg Kurz <gr...@kaod.org>
Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com>
---
tests/Makefile.include | 2 +-
tests/virtio-9p-test.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2f11064699d7..6052a3828f68 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -627,7 +627,7 @@ tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o
$(libqos-virtio-obj-y)
tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y)
$(libqos-virtio-obj-y)
tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y)
tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o
$(libqos-virtio-obj-y)
-tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o
+tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
tests/tpci200-test$(EXESUF): tests/tpci200-test.o
diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index 45fc8041d7f3..b8fb6cd869a9 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -10,6 +10,13 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu-common.h"
+#include "libqos/pci-pc.h"
+#include "libqos/virtio.h"
+#include "libqos/virtio-pci.h"
+#include "libqos/malloc.h"
+#include "libqos/malloc-pc.h"
+#include "standard-headers/linux/virtio_ids.h"
+#include "standard-headers/linux/virtio_pci.h"
static const char mount_tag[] = "qtest";
static char *test_share;
@@ -42,10 +49,80 @@ static void pci_nop(void)
qvirtio_9p_stop();
}
+typedef struct {
+ QVirtioDevice *dev;
+ QGuestAllocator *alloc;
+ QPCIBus *bus;
+ QVirtQueue *vq;
+} QVirtIO9P;
+
+static QVirtIO9P *qvirtio_9p_pci_init(void)
+{
+ QVirtIO9P *v9p;
+ QVirtioPCIDevice *dev;
+
+ v9p = g_new0(QVirtIO9P, 1);
+ v9p->alloc = pc_alloc_init();
+ v9p->bus = qpci_init_pc();
+
+ dev = qvirtio_pci_device_find(v9p->bus, VIRTIO_ID_9P);
+ g_assert_nonnull(dev);
+ g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_9P);
+ v9p->dev = (QVirtioDevice *) dev;
+
+ qvirtio_pci_device_enable(dev);
+ qvirtio_reset(&qvirtio_pci, v9p->dev);
+ qvirtio_set_acknowledge(&qvirtio_pci, v9p->dev);
+ qvirtio_set_driver(&qvirtio_pci, v9p->dev);
+
+ v9p->vq = qvirtqueue_setup(&qvirtio_pci, v9p->dev, v9p->alloc, 0);
+ return v9p;
+}
+
+static void qvirtio_9p_pci_free(QVirtIO9P *v9p)
+{
+ qvirtqueue_cleanup(&qvirtio_pci, v9p->vq, v9p->alloc);
+ pc_alloc_uninit(v9p->alloc);
+ qvirtio_pci_device_disable(container_of(v9p->dev, QVirtioPCIDevice, vdev));
+ g_free(v9p->dev);
+ qpci_free_pc(v9p->bus);
+ g_free(v9p);
+}
+
+static void pci_basic_config(void)
+{
+ QVirtIO9P *v9p;
+ void *addr;
+ size_t tag_len;
+ char *tag;
+ int i;
+
+ qvirtio_9p_start();
+ v9p = qvirtio_9p_pci_init();
+
+ addr = ((QVirtioPCIDevice *) v9p->dev)->addr +
VIRTIO_PCI_CONFIG_OFF(false);
+ tag_len = qvirtio_config_readw(&qvirtio_pci, v9p->dev,
+ (uint64_t)(uintptr_t)addr);
+ g_assert_cmpint(tag_len, ==, strlen(mount_tag));
+ addr += sizeof(uint16_t);
+
+ tag = g_malloc(tag_len);
+ for (i = 0; i < tag_len; i++) {
+ tag[i] = qvirtio_config_readb(&qvirtio_pci, v9p->dev,
+ (uint64_t)(uintptr_t)addr + i);
+ }
+ g_assert_cmpmem(tag, tag_len, mount_tag, tag_len);
+ g_free(tag);
+
+ qvirtio_9p_pci_free(v9p);
+ qvirtio_9p_stop();
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
qtest_add_func("/virtio/9p/pci/nop", pci_nop);
+ qtest_add_func("/virtio/9p/pci/basic/configuration", pci_basic_config);
return g_test_run();
}
--
2.5.5
