qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>,
	Laurent Vivier <laurent@vivier.eu>,
	Thomas Huth <thuth@redhat.com>
Subject: [Qemu-devel] [PATCH 55/71] tests/libqos: virtio-scsi driver and interface nodes
Date: Mon,  3 Dec 2018 16:33:08 +0100	[thread overview]
Message-ID: <1543851204-41186-56-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1543851204-41186-1-git-send-email-pbonzini@redhat.com>

From: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>

Add qgraph nodes for virtio-scsi-pci and virtio-scsi-device.
Both nodes produce virtio-scsi, but virtio-scsi-pci receives
a pci-bus and uses virtio-pci QOSGraphObject and its functions,
while virtio-scsi-device receives a virtio and implements
its own functions

Signed-off-by: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/Makefile.include     |   1 +
 tests/libqos/virtio-scsi.c | 117 +++++++++++++++++++++++++++++++++++++++++++++
 tests/libqos/virtio-scsi.h |  39 +++++++++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 tests/libqos/virtio-scsi.c
 create mode 100644 tests/libqos/virtio-scsi.h

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 070d93e..3d58798 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -669,6 +669,7 @@ qos-test-obj-y += tests/libqos/virtio-balloon.o
 qos-test-obj-y += tests/libqos/virtio-blk.o
 qos-test-obj-y += tests/libqos/virtio-net.o
 qos-test-obj-y += tests/libqos/virtio-rng.o
+qos-test-obj-y += tests/libqos/virtio-scsi.o
 qos-test-obj-y += tests/libqos/virtio-serial.o
 
 # Machines
diff --git a/tests/libqos/virtio-scsi.c b/tests/libqos/virtio-scsi.c
new file mode 100644
index 0000000..482684d
--- /dev/null
+++ b/tests/libqos/virtio-scsi.c
@@ -0,0 +1,117 @@
+/*
+ * libqos driver framework
+ *
+ * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "qemu/osdep.h"
+#include "libqtest.h"
+#include "standard-headers/linux/virtio_ids.h"
+#include "libqos/qgraph.h"
+#include "libqos/virtio-scsi.h"
+
+/* virtio-scsi-device */
+static void *qvirtio_scsi_get_driver(QVirtioSCSI *v_scsi,
+                                     const char *interface)
+{
+    if (!g_strcmp0(interface, "virtio-scsi")) {
+        return v_scsi;
+    }
+    if (!g_strcmp0(interface, "virtio")) {
+        return v_scsi->vdev;
+    }
+
+    fprintf(stderr, "%s not present in virtio-scsi-device\n", interface);
+    g_assert_not_reached();
+}
+
+static void *qvirtio_scsi_device_get_driver(void *object,
+                                            const char *interface)
+{
+    QVirtioSCSIDevice *v_scsi = object;
+    return qvirtio_scsi_get_driver(&v_scsi->scsi, interface);
+}
+
+static void *virtio_scsi_device_create(void *virtio_dev,
+                                          QGuestAllocator *t_alloc,
+                                          void *addr)
+{
+    QVirtioSCSIDevice *virtio_bdevice = g_new0(QVirtioSCSIDevice, 1);
+    QVirtioSCSI *interface = &virtio_bdevice->scsi;
+
+    interface->vdev = virtio_dev;
+
+    virtio_bdevice->obj.get_driver = qvirtio_scsi_device_get_driver;
+
+    return &virtio_bdevice->obj;
+}
+
+/* virtio-scsi-pci */
+static void *qvirtio_scsi_pci_get_driver(void *object,
+                                         const char *interface)
+{
+    QVirtioSCSIPCI *v_scsi = object;
+    if (!g_strcmp0(interface, "pci-device")) {
+        return v_scsi->pci_vdev.pdev;
+    }
+    return qvirtio_scsi_get_driver(&v_scsi->scsi, interface);
+}
+
+static void *virtio_scsi_pci_create(void *pci_bus,
+                                    QGuestAllocator *t_alloc,
+                                    void *addr)
+{
+    QVirtioSCSIPCI *virtio_spci = g_new0(QVirtioSCSIPCI, 1);
+    QVirtioSCSI *interface = &virtio_spci->scsi;
+    QOSGraphObject *obj = &virtio_spci->pci_vdev.obj;
+
+    virtio_pci_init(&virtio_spci->pci_vdev, pci_bus, addr);
+    interface->vdev = &virtio_spci->pci_vdev.vdev;
+
+    g_assert_cmphex(interface->vdev->device_type, ==, VIRTIO_ID_SCSI);
+
+    obj->get_driver = qvirtio_scsi_pci_get_driver;
+
+    return obj;
+}
+
+static void virtio_scsi_register_nodes(void)
+{
+    QPCIAddress addr = {
+        .devfn = QPCI_DEVFN(4, 0),
+    };
+
+    QOSGraphEdgeOptions opts = {
+        .before_cmd_line = "-drive id=drv0,if=none,file=null-co://,format=raw",
+        .after_cmd_line = "-device scsi-hd,bus=vs0.0,drive=drv0",
+    };
+
+    /* virtio-scsi-device */
+    opts.extra_device_opts = "id=vs0";
+    qos_node_create_driver("virtio-scsi-device",
+                            virtio_scsi_device_create);
+    qos_node_consumes("virtio-scsi-device", "virtio-bus", &opts);
+    qos_node_produces("virtio-scsi-device", "virtio-scsi");
+
+    /* virtio-scsi-pci */
+    opts.extra_device_opts = "id=vs0,addr=04.0";
+    add_qpci_address(&opts, &addr);
+    qos_node_create_driver("virtio-scsi-pci", virtio_scsi_pci_create);
+    qos_node_consumes("virtio-scsi-pci", "pci-bus", &opts);
+    qos_node_produces("virtio-scsi-pci", "pci-device");
+    qos_node_produces("virtio-scsi-pci", "virtio-scsi");
+}
+
+libqos_init(virtio_scsi_register_nodes);
diff --git a/tests/libqos/virtio-scsi.h b/tests/libqos/virtio-scsi.h
new file mode 100644
index 0000000..17a47be
--- /dev/null
+++ b/tests/libqos/virtio-scsi.h
@@ -0,0 +1,39 @@
+/*
+ * libqos driver framework
+ *
+ * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "libqos/qgraph.h"
+#include "libqos/virtio.h"
+#include "libqos/virtio-pci.h"
+
+typedef struct QVirtioSCSI QVirtioSCSI;
+typedef struct QVirtioSCSIPCI QVirtioSCSIPCI;
+typedef struct QVirtioSCSIDevice QVirtioSCSIDevice;
+
+struct QVirtioSCSI {
+    QVirtioDevice *vdev;
+};
+
+struct QVirtioSCSIPCI {
+    QVirtioPCIDevice pci_vdev;
+    QVirtioSCSI scsi;
+};
+
+struct QVirtioSCSIDevice {
+    QOSGraphObject obj;
+    QVirtioSCSI scsi;
+};
-- 
1.8.3.1

  parent reply	other threads:[~2018-12-03 15:35 UTC|newest]

Thread overview: 103+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-03 15:32 [Qemu-devel] [PATCH for-4.0 00/71] qtest: qgraph driver framework Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 01/71] vhost-net: move stubs to a separate file Paolo Bonzini
2018-12-03 21:10   ` Eric Blake
2018-12-04 16:04   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 02/71] vhost-net-user: add stubs for when no virtio-net device is present Paolo Bonzini
2018-12-06 13:29   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 03/71] vhost: restrict Linux dependency to kernel vhost Paolo Bonzini
2018-12-06 13:36   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 04/71] vhost-net: compile it on all targets that have virtio-net Paolo Bonzini
2018-12-06 13:45   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 05/71] vhost-net: revamp configure logic Paolo Bonzini
2018-12-06 16:12   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 06/71] vhost-user-test: use g_cond_broadcast Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 07/71] vhost-user-test: signal data_cond when s->rings changes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 08/71] vhost-user: support cross-endian vnet headers Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 09/71] vhost-user-test: support VHOST_USER_PROTOCOL_F_CROSS_ENDIAN Paolo Bonzini
2018-12-06 16:15   ` Thomas Huth
2018-12-06 20:06     ` Paolo Bonzini
2018-12-07  5:50       ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 10/71] vhost-user-test: skip if there is no memory at address 0 Paolo Bonzini
2018-12-06 16:26   ` Thomas Huth
2018-12-06 20:06     ` Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 11/71] vhost-user-test: reduce usage of global_qtest Paolo Bonzini
2018-12-06 16:36   ` Thomas Huth
2018-12-06 20:08     ` Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 12/71] vhost-user-test: create a main loop per TestServer Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 13/71] vhost-user-test: small changes to init_hugepagefs Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 14/71] vhost-user-test: create a temporary directory per TestServer Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 15/71] tests/libqos: introduce virtio_start_device Paolo Bonzini
2018-12-07  9:16   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 16/71] tests/libqos: rename qpci_init_pc and qpci_init_spapr functions Paolo Bonzini
2018-12-07  9:23   ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 17/71] tests: remove rule for nonexisting qdev-monitor-test Paolo Bonzini
2018-12-07  9:24   ` Thomas Huth
2018-12-12 14:12   ` Philippe Mathieu-Daudé
2018-12-03 15:32 ` [Qemu-devel] [PATCH 18/71] tests/libqos: embed allocators instead of malloc-ing them Paolo Bonzini
2018-12-07 12:32   ` Thomas Huth
2018-12-07 13:57     ` Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 19/71] tests: qgraph API for the qtest driver framework Paolo Bonzini
2018-12-07 12:42   ` Thomas Huth
2018-12-07 13:57     ` Paolo Bonzini
2018-12-07 15:38   ` Thomas Huth
2018-12-12 11:09     ` Paolo Bonzini
2018-12-12 11:47       ` Thomas Huth
2018-12-03 15:32 ` [Qemu-devel] [PATCH 20/71] tests/libqos: pci-pc driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 21/71] tests/libqos: x86_64/pc machine node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 22/71] tests/libqos: sdhci driver and interface nodes Paolo Bonzini
2018-12-12 14:35   ` Philippe Mathieu-Daudé
2018-12-12 15:25     ` Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 23/71] tests/libqos: arm/raspi2 machine node Paolo Bonzini
2018-12-12 15:26   ` Philippe Mathieu-Daudé
2018-12-03 15:32 ` [Qemu-devel] [PATCH 24/71] tests/libqos: arm/smdkc210 " Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 25/71] tests/libqos: arm/sabrelite " Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 26/71] tests/libqos: arm/xilinx-zynq-a9 " Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 27/71] tests/libqos: aarch64/xlnx-zcu102 " Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 28/71] qos-test: sdhci test node Paolo Bonzini
2018-12-12 14:28   ` Philippe Mathieu-Daudé
2018-12-03 15:32 ` [Qemu-devel] [PATCH 29/71] tests/qgraph: add generic PCI testcases Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 30/71] tests/libqos: pci-spapr driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 31/71] tests/qgraph: ppc64/pseries machine node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 32/71] tests/libqos: has_buggy_msi flag Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 33/71] tests/libqos: e1000e driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 34/71] qos-test: e1000e test node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 35/71] tests/libqos: virtio-pci driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 36/71] tests/libqos: remove global_qtest from virtio endianness checks Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 37/71] tests/libqos: virtio-mmio driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 38/71] tests/libqos: arm/virt machine node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 39/71] tests/qgraph: add generic virtio testcases Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 40/71] tests/libqos: virtio-serial driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 41/71] qos-test: virtio-console and virtio-serial test node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 42/71] tests/libqos: virtio-9p driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 43/71] qos-test: virtio-9p test node Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 44/71] tests/libqos: virtio-balloon driver and interface nodes Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 45/71] tests/qgraph: remove virtio-balloon-test Paolo Bonzini
2018-12-03 15:32 ` [Qemu-devel] [PATCH 46/71] tests/libqos: virtio-rng driver and interface nodes Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 47/71] qos-test: virtio-rng test node Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 48/71] tests/libqos: virtio-blk driver and interface nodes Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 49/71] qos-test: virtio-blk test node Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 50/71] tests/libqos: virtio-net driver and interface nodes Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 51/71] qos-test: virtio-net test node Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 52/71] tests/libqos: support multiqueue for virtio-net Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 53/71] vhost-user-test: always use 256 MiB of guest memory Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 54/71] qos-test: vhost-user test node Paolo Bonzini
2018-12-03 15:33 ` Paolo Bonzini [this message]
2018-12-03 15:33 ` [Qemu-devel] [PATCH 56/71] qos-test: virtio-scsi " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 57/71] tests/libqos: remove pre-qgraph QVirtioPCIDevice API Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 58/71] tests: move virtio entirely to qos-test Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 59/71] qos-test: ac97 test node Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 60/71] qos-test: tpci200 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 61/71] qos-test: ipoctal232 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 62/71] qos-test: ne2k_pci " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 63/71] qos-test: nvme " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 64/71] qos-test: pcnet " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 65/71] qos-test: spapr-phb " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 66/71] qos-test: usb-hcd-ohci " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 67/71] qos-test: vmxnet3 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 68/71] qos-test: es1370 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 69/71] qos-test: eepro100 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 70/71] qos-test: e1000 " Paolo Bonzini
2018-12-03 15:33 ` [Qemu-devel] [PATCH 71/71] qos-test: megasas " Paolo Bonzini
2018-12-03 20:45 ` [Qemu-devel] [PATCH for-4.0 00/71] qtest: qgraph driver framework no-reply
2018-12-12 15:15 ` Philippe Mathieu-Daudé
2018-12-12 15:31 ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1543851204-41186-56-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=e.emanuelegiuseppe@gmail.com \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).