diff mbox

[2/3] tests: virtio-9p: add basic configuration test

Message ID 147340829147.6462.6214637588245966144.stgit@bahia (mailing list archive)
State New, archived
Headers show

Commit Message

Greg Kurz Sept. 9, 2016, 8:04 a.m. UTC 
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 <groug@kaod.org>
---
 tests/Makefile.include |    2 +
 tests/virtio-9p-test.c |   82 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 3 deletions(-)

Comments

Cornelia Huck Sept. 15, 2016, 8:40 a.m. UTC | #1 
On Fri, 09 Sep 2016 10:04:51 +0200
Greg Kurz <groug@kaod.org> wrote:

> 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 <groug@kaod.org>
> ---
>  tests/Makefile.include |    2 +
>  tests/virtio-9p-test.c |   82 +++++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 81 insertions(+), 3 deletions(-)

> +static const char mount_tag[] = "qtest";
>  static char *test_share;
> 
>  static void qvirtio_9p_start(void)
> @@ -21,8 +29,8 @@ static void qvirtio_9p_start(void)
>      g_assert_nonnull(mkdtemp(test_share));
> 
>      args = g_strdup_printf("-fsdev local,id=fsdev0,security_model=none,path=%s "
> -                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=qtest",
> -                           test_share);
> +                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=%s",
> +                           test_share, mount_tag);
> 
>      qtest_start(args);
>      g_free(args);

Maybe move this change to patch 1?
Greg Kurz Sept. 15, 2016, 12:09 p.m. UTC | #2 
On Thu, 15 Sep 2016 10:40:45 +0200
Cornelia Huck <cornelia.huck@de.ibm.com> wrote:

> On Fri, 09 Sep 2016 10:04:51 +0200
> Greg Kurz <groug@kaod.org> wrote:
> 
> > 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 <groug@kaod.org>
> > ---
> >  tests/Makefile.include |    2 +
> >  tests/virtio-9p-test.c |   82 +++++++++++++++++++++++++++++++++++++++++++++++-
> >  2 files changed, 81 insertions(+), 3 deletions(-)  
> 
> > +static const char mount_tag[] = "qtest";
> >  static char *test_share;
> > 
> >  static void qvirtio_9p_start(void)
> > @@ -21,8 +29,8 @@ static void qvirtio_9p_start(void)
> >      g_assert_nonnull(mkdtemp(test_share));
> > 
> >      args = g_strdup_printf("-fsdev local,id=fsdev0,security_model=none,path=%s "
> > -                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=qtest",
> > -                           test_share);
> > +                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=%s",
> > +                           test_share, mount_tag);
> > 
> >      qtest_start(args);
> >      g_free(args);  
> 
> Maybe move this change to patch 1?
> 

It isn't strictly needed in patch 1 since the mount tag has only one user there,
but on the other hand, it isn't related to the purpose of patch 2 either. So I
guess your suggestion makes sense: I'll move this change.

Thanks.

--
Greg
diff mbox

Patch

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 03382b5fe7b8..a9dce206fbf6 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -600,7 +600,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 ed53f21bc31f..d7d508481bc0 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -10,7 +10,15 @@ 
 #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;
 
 static void qvirtio_9p_start(void)
@@ -21,8 +29,8 @@  static void qvirtio_9p_start(void)
     g_assert_nonnull(mkdtemp(test_share));
 
     args = g_strdup_printf("-fsdev local,id=fsdev0,security_model=none,path=%s "
-                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=qtest",
-                           test_share);
+                           "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=%s",
+                           test_share, mount_tag);
 
     qtest_start(args);
     g_free(args);
@@ -41,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();
 }