Re: [Qemu-devel] [RFC] Functions bus_foreach and device_find from libqos virtio API

[Fam Zheng]

On Mon, 06/23 16:55, Marc Marí wrote:
> diff --git a/tests/Makefile b/tests/Makefile
> index 4caf7de..b85a036 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -282,6 +282,7 @@ libqos-obj-y += tests/libqos/i2c.o
>  libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
>  libqos-pc-obj-y += tests/libqos/malloc-pc.o
>  libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
> +libqos-virtio-obj-y = $(libqos-obj-y) $(libqos-pc-obj-y) 
> tests/libqos/virtio-pci.o

$(libqos-pc-obj-y) has $(libqos-obj-y) itself, two lines above. So no need to
add again.
> diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
> new file mode 100644
> index 0000000..62c238f
> --- /dev/null
> +++ b/tests/libqos/virtio-pci.c
> @@ -0,0 +1,123 @@
> +/*
> + * libqos virtio definitions

PCI

> + *
> + * Copyright (c) 2014 Marc Marí
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h
> new file mode 100644
> index 0000000..d92bcf2
> --- /dev/null
> +++ b/tests/libqos/virtio-pci.h
> @@ -0,0 +1,40 @@
> +/*
> + * libqos virtio PCI definitions
> + *
> + * Copyright (c) 2014 Marc Marí
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef LIBQOS_VIRTIO_PCI_H
> +#define LIBQOS_VIRTIO_PCI_H
> +
> +#include "libqos/virtio.h"
> +
> +void qvirtio_pci_notify(QVirtioDevice *d, uint16_t vector);
> +void qvirtio_pci_get_config(QVirtioDevice *d, void *config);
> +void qvirtio_pci_set_config(QVirtioDevice *d, void *config);
> +uint32_t qvirtio_pci_get_features(QVirtioDevice *d);
> +uint8_t qvirtio_pci_get_status(QVirtioDevice *d);
> +void qvirtio_pci_set_status(QVirtioDevice *d, uint8_t val);
> +void qvirtio_pci_reset(QVirtioDevice *d);
> +uint8_t qvirtio_pci_query_isr(QVirtioDevice *d);
> +void qvirtio_pci_foreach(uint16_t device_id,
> +                void (*func)(QVirtioDevice *d, void *data), void *data);
> +QVirtioDevice *qvirtio_pci_device_find(uint16_t device_id);
> +
> +const QVirtioBus qvirtio_pci = {
> +    .notify = qvirtio_pci_notify,
> +    .get_config = qvirtio_pci_get_config,
> +    .set_config = qvirtio_pci_set_config,
> +    .get_features = qvirtio_pci_get_features,
> +    .get_status = qvirtio_pci_get_status,
> +    .set_status = qvirtio_pci_set_status,
> +    .reset = qvirtio_pci_reset,
> +    .query_isr = qvirtio_pci_query_isr,
> +    .bus_foreach = qvirtio_pci_foreach,
> +    .device_find = qvirtio_pci_device_find,
> +};

Each source file to include this header will define its own copy of
qvirtio_pci. Please move this to tests/libqos/virtio-pci.c. And can you make
the implementation functions static, because they are already accessed through
members of qvirtio_pci?

> +
> +#endif
> diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h
> new file mode 100644
> index 0000000..838aae4
> --- /dev/null
> +++ b/tests/libqos/virtio.h

<snip>

> +/*QVirtioBus *qvirtio_pci_init();
> +QVirtioBus *qvirtio_mmio_init();
> +QVirtioBus *qvirtio_ccw_init();*/

When you drop RFC, please drop this,

> +
> +/*
> +I'm not sure what implementation of VirtQueue is better, QEMU's or Linux's. I
> +think QEMU implementation is better, because it will be easier to connect the
> +QEMU Virtqueue with the Libaos VirtQueue.
> +
> +The functions to use the VirtQueue are the ones I think necessary in Libqos, 
> but
> +probably there are some missing and some others that are not necessary.
> +*/

and this,

> diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
> index d53f875..4f5b1e0 100644
> --- a/tests/virtio-blk-test.c
> +++ b/tests/virtio-blk-test.c
> @@ -2,6 +2,7 @@
>   * QTest testcase for VirtIO Block Device
>   *
>   * Copyright (c) 2014 SUSE LINUX Products GmbH
> + * Copyright (c) 2014 Marc Marí
>   *
>   * This work is licensed under the terms of the GNU GPL, version 2 or later.
>   * See the COPYING file in the top-level directory.
> @@ -9,26 +10,51 @@
>  
>  #include <glib.h>
>  #include <string.h>
> +#include <stdlib.h>
> +#include <unistd.h>
> +#include <stdio.h>
>  #include "libqtest.h"
> -#include "qemu/osdep.h"
> +#include "libqos/virtio.h"
> +/*#include "qemu/osdep.h"*/

and this.

>  
> -/* Tests only initialization so far. TODO: Replace with functional tests */
> -static void pci_nop(void)
> +#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
> +
> +static char tmp_path[] = "/tmp/qtest.XXXXXX";
> +extern QVirtioBus qvirtio_pci;
> +
> +static void pci_basic(void)
>  {
> +    QVirtioDevice *dev;
> +    dev = qvirtio_pci.device_find(VIRTIO_BLK_DEVICE_ID);
> +    fprintf(stderr, "Device: %x %x %x\n",
> +                            dev->device_id, dev->location, dev->device_type);
>  }
>  
>  int main(int argc, char **argv)
>  {
>      int ret;
> +    int fd;
> +    char test_start[100];

Depending on length of tmp_path, this looks quite close to an overflow ...

>  
>      g_test_init(&argc, &argv, NULL);
> -    qtest_add_func("/virtio/blk/pci/nop", pci_nop);
> +    qtest_add_func("/virtio/blk/pci/basic", pci_basic);
>  
> -    qtest_start("-drive id=drv0,if=none,file=/dev/null "
> -                "-device virtio-blk-pci,drive=drv0");
> +    /* Create a temporary raw image */
> +    fd = mkstemp(tmp_path);
> +    g_assert_cmpint(fd, >=, 0);
> +    ret = ftruncate(fd, TEST_IMAGE_SIZE);
> +    g_assert_cmpint(ret, ==, 0);
> +    close(fd);
> +
> +    sprintf(test_start, "-drive if=none,id=drive0,file=%s "
> +                    "-device virtio-blk-pci,drive=drive0", tmp_path);

... here. Also please use snprintf.

> +    qtest_start(test_start);
>      ret = g_test_run();
>  
>      qtest_end();
>  
> +    /* Cleanup */
> +    unlink(tmp_path);
> +
>      return ret;
>  }
> -- 
> 1.7.10.4
> 
> 

Fam