Re: [Qemu-devel] [PATCH v3] tests: Functions bus_foreach and device_find from libqos virtio API

2014-07-03 Thread Stefan Hajnoczi 
On Mon, Jun 30, 2014 at 11:55:46AM +0200, Marc Marí wrote:
 +static void qvirtio_pci_foreach_callback(
 +QPCIDevice *dev, int devfn, void *data)
 +{
 +QVirtioPCIForeachData *d = data;
 +QVirtioPCIDevice *vpcidev = qpcidevice_to_qvirtiodevice(dev);
 +
 +if (vpcidev-vdev.device_type == d-device_type) {
 +d-func(vpcidev-vdev, d-user_data);
 +}

We should think about memory management here.  Who will free vpcidev?

In the case where device_type matches, -func() should be responsible
for the virtio device it receives.

In the case where device_type does not match, we must free vpcidev.

 +}
 +
 +static void qvirtio_pci_assign_device(QVirtioDevice *d, void *data)
 +{
 +QVirtioPCIDevice *vpcidev = data;
 +vpcidev-pdev   = ((QVirtioPCIDevice *)d)-pdev;
 +vpcidev-vdev.device_type   = ((QVirtioPCIDevice *)d)-vdev.device_type;
 +}

This function may need to g_free(d) once you've settled on a memory
management rules for virtio-pci.c.

 +typedef struct QVirtioPCIForeachData {
 +void (*func)(QVirtioDevice *d, void *data);
 +uint16_t device_type;
 +void *user_data;
 +} QVirtioPCIForeachData;

This is only used within virtio-pci.c.  It should be declared there too
since it doesn't need to be public.

 diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h
 new file mode 100644
 index 000..52f6b5b
 --- /dev/null
 +++ b/tests/libqos/virtio.h
 @@ -0,0 +1,28 @@
 +/*
 + * libqos virtio 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_H
 +#define LIBQOS_VIRTIO_H
 +
 +#define QVIRTQUEUE_MAX_SIZE 1024

Unused, please drop.

 +#define QVIRTIO_VENDOR_ID   0x1AF4
 +
 +#define QVIRTIO_NET_DEVICE_ID   0x1
 +#define QVIRTIO_BLK_DEVICE_ID   0x2
 +
 +typedef struct QVirtioDevice QVirtioDevice;
 +typedef struct QVirtQueue QVirtQueue;
 +typedef struct QVRing QVRing;

QVirtQueue and QVRing are unused.  Please drop them.

 +static void pci_basic(void)
 +{
 +QVirtioPCIDevice *dev;
 +QPCIBus *bus;
 +
 +bus = test_start();
 +
 +dev = qvirtio_pci_device_find(bus, QVIRTIO_BLK_DEVICE_ID);
 +g_assert_cmphex(dev-vdev.device_type, ==, QVIRTIO_BLK_DEVICE_ID);
 +g_assert_cmphex(dev-pdev-devfn, ==, ((PCI_SLOT  3) | PCI_FN));

Should dev be freed once we are done with it?


pgppvCERYuSb_.pgp
Description: PGP signature

[Qemu-devel] [PATCH v3] tests: Functions bus_foreach and device_find from libqos virtio API

2014-06-30 Thread Marc Marí 
Virtio header has been changed to compile and work with a real device.
Functions bus_foreach and device_find have been implemented for PCI.
Virtio-blk test case now opens a fake device.

Signed-off-by: Marc Marí marc.mari.barc...@gmail.com
---
 tests/Makefile|3 +-
 tests/libqos/virtio-pci.c |   72 +
 tests/libqos/virtio-pci.h |   31 +++
 tests/libqos/virtio.h |   28 ++
 tests/virtio-blk-test.c   |   65 +++-
 5 files changed, 190 insertions(+), 9 deletions(-)
 create mode 100644 tests/libqos/virtio-pci.c
 create mode 100644 tests/libqos/virtio-pci.h
 create mode 100644 tests/libqos/virtio.h

diff --git a/tests/Makefile b/tests/Makefile
index 7e53d0d..028c462 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -292,6 +292,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
 
 tests/rtc-test$(EXESUF): tests/rtc-test.o
 tests/m48t59-test$(EXESUF): tests/m48t59-test.o
@@ -312,7 +313,7 @@ tests/eepro100-test$(EXESUF): tests/eepro100-test.o
 tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
 tests/ne2000-test$(EXESUF): tests/ne2000-test.o
 tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
-tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o
+tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y)
 tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o
 tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o
 tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o
diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
new file mode 100644
index 000..9fd9735
--- /dev/null
+++ b/tests/libqos/virtio-pci.c
@@ -0,0 +1,72 @@
+/*
+ * libqos virtio PCI driver
+ *
+ * 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.
+ */
+
+#include glib.h
+#include stdio.h
+#include libqtest.h
+#include libqos/virtio.h
+#include libqos/virtio-pci.h
+#include libqos/pci.h
+#include libqos/pci-pc.h
+
+#include hw/pci/pci_regs.h
+
+static QVirtioPCIDevice *qpcidevice_to_qvirtiodevice(QPCIDevice *pdev)
+{
+QVirtioPCIDevice *vpcidev;
+vpcidev = g_malloc0(sizeof(*vpcidev));
+
+if (pdev) {
+vpcidev-pdev = pdev;
+vpcidev-vdev.device_type =
+qpci_config_readw(vpcidev-pdev, PCI_SUBSYSTEM_ID);
+}
+
+return vpcidev;
+}
+
+static void qvirtio_pci_foreach_callback(
+QPCIDevice *dev, int devfn, void *data)
+{
+QVirtioPCIForeachData *d = data;
+QVirtioPCIDevice *vpcidev = qpcidevice_to_qvirtiodevice(dev);
+
+if (vpcidev-vdev.device_type == d-device_type) {
+d-func(vpcidev-vdev, d-user_data);
+}
+}
+
+static void qvirtio_pci_assign_device(QVirtioDevice *d, void *data)
+{
+QVirtioPCIDevice *vpcidev = data;
+vpcidev-pdev   = ((QVirtioPCIDevice *)d)-pdev;
+vpcidev-vdev.device_type   = ((QVirtioPCIDevice *)d)-vdev.device_type;
+}
+
+void qvirtio_pci_foreach(QPCIBus *bus, uint16_t device_type,
+void (*func)(QVirtioDevice *d, void *data), void *data)
+{
+QVirtioPCIForeachData d = { .func = func,
+.device_type = device_type,
+.user_data = data };
+
+qpci_device_foreach(bus, QVIRTIO_VENDOR_ID, -1,
+qvirtio_pci_foreach_callback, d);
+}
+
+QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_type)
+{
+QVirtioPCIDevice *dev;
+
+dev = g_malloc0(sizeof(*dev));
+qvirtio_pci_foreach(bus, device_type, qvirtio_pci_assign_device, dev);
+
+return dev;
+}
+
diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h
new file mode 100644
index 000..f00a982
--- /dev/null
+++ b/tests/libqos/virtio-pci.h
@@ -0,0 +1,31 @@
+/*
+ * 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
+#include libqos/pci.h
+
+typedef struct QVirtioPCIDevice {
+QVirtioDevice vdev;
+QPCIDevice *pdev;
+} QVirtioPCIDevice;
+
+typedef struct QVirtioPCIForeachData {
+void (*func)(QVirtioDevice *d, void *data);
+uint16_t device_type;
+void *user_data;
+} QVirtioPCIForeachData;
+
+void qvirtio_pci_foreach(QPCIBus *bus, uint16_t device_type,
+void (*func)(QVirtioDevice *d, void *data), void *data);
+
+QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_type);
+#endif
diff --git