From nobody Tue Nov 4 22:00:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533567621378838.3399743451549; Mon, 6 Aug 2018 08:00:21 -0700 (PDT) Received: from localhost ([::1]:34488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgzb-0002LA-Vs for importer@patchew.org; Mon, 06 Aug 2018 11:00:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgbP-0005Om-MH for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgbO-000193-0X for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:19 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:44109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgbN-00018F-BU for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:17 -0400 Received: by mail-ed1-x543.google.com with SMTP id f23-v6so5237967edr.11 for ; Mon, 06 Aug 2018 07:35:17 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.126]) by smtp.gmail.com with ESMTPSA id x13-v6sm14615157edx.17.2018.08.06.07.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bPLTMZwVwF9AWFj+fcQmVLY7988yDi7Y6+Jl4GncZ3M=; b=WtCEWB+t2LCVm1+a8qGsJojAb3SAgaz5qViGKV6U7/0lNWiexrDPTvCrkD0TWFHPAM QeGTA0jkxpC/zcce8U3QBdT3JlOuRZaQn0Ehgb+yVLEe75E3dAspKWRthQezaaLM5afV fhW4GSE8D6n3iHUI0AiNvzEIp+vUYkO3dkKMd5SoQ1MI/Q7oHOxaQnto2ywIHiwoYfUp dKMpXooInugvdz3yq6RNTvdDmpURUCNTemBja8jzw7MHn5yooutuYI3PQqkb9FWC3duM lIom+L5qX7Mq6f8zH+bP1EF32JAcdXIy7ZPGjHvdboC4fNaYXo2mjksT22amYhJyn2Z/ ybbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bPLTMZwVwF9AWFj+fcQmVLY7988yDi7Y6+Jl4GncZ3M=; b=EFmMhNUjx5yy9ymnDCglluOvsoXTafO7PJt2EN4R9kVaz/xC/fk9e0KVJOxQdwtvag 1xC6RfKa023wyWO5ZPQ1lCL3MJTW8aL9/Gh3tECxx+F+aYDFsw0VAXDAWVWM2D9kvYSA MiJljgYE7nTyeLlSKSrmkZ3hHlZWR/dA4nYLfgSU3vtW+xqnvDykoUGwhVxuEIEtS3c4 kJzk9Hgbmyih66R7YeMwQruHYghE6J9yRBfPRRnbjpREFvQqpCwvgGGtMaonRkcBL4NY ofg75T4hyYoCFF6FIGyOYWObisyOwkqrueT3Hup3X+ypMNZw3hKdeGlSvF8TUbK+NmoR YYTQ== X-Gm-Message-State: AOUpUlGUqkd/98xOsepfDADryDgH9lZHRLckpF1vI1FUkZUljfbJqsDb E38qK9yu6ZgBK9kko0bdhEE= X-Google-Smtp-Source: AAOMgpdHt7Yj+ybfI1yKVvkZE+OfISkJiGxoBoeVVuNzPxWMlzmCcw46Zyx91B7mYlOlX1Yal4bH0g== X-Received: by 2002:a50:de8e:: with SMTP id c14-v6mr18387679edl.196.1533566116324; Mon, 06 Aug 2018 07:35:16 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:34:10 +0200 Message-Id: <20180806143412.27722-33-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> References: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::543 Subject: [Qemu-devel] [PATCH v2 32/34] test/qgraph: virtio-scsi driver and interface nodes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Stefan Hajnoczi , Emanuele Giuseppe Esposito , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 4634fd8ef1..c5aa9f18b7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -768,6 +768,7 @@ libqgraph-virtio-obj-y +=3D tests/libqos/virtio-balloon= .o libqgraph-virtio-obj-y +=3D tests/libqos/virtio-rng.o libqgraph-virtio-obj-y +=3D tests/libqos/virtio-blk.o libqgraph-virtio-obj-y +=3D tests/libqos/virtio-net.o +libqgraph-virtio-obj-y +=3D tests/libqos/virtio-scsi.o =20 libqgraph-pci-obj-y =3D $(libqos-virtio-obj-y) libqgraph-pci-obj-y +=3D $(libqgraph-machines-obj-y) diff --git a/tests/libqos/virtio-scsi.c b/tests/libqos/virtio-scsi.c new file mode 100644 index 0000000000..e751ef639d --- /dev/null +++ b/tests/libqos/virtio-scsi.c @@ -0,0 +1,117 @@ +/* + * libqos driver framework + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito + * + * 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 + */ + +#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_device_destroy(QOSGraphObject *obj) +{ + QVirtioSCSIDevice *v_scsi =3D (QVirtioSCSIDevice *) obj; + + g_free(v_scsi); +} + +static void *qvirtio_scsi_device_get_driver(void *object, + const char *interface) +{ + QVirtioSCSIDevice *v_scsi =3D object; + if (!g_strcmp0(interface, "virtio-scsi")) { + return &v_scsi->scsi; + } + + printf("%s not present in virtio-scsi-device\n", interface); + abort(); +} + +static void *virtio_scsi_device_create(void *virtio_dev, + QGuestAllocator *t_alloc, + void *addr) +{ + QVirtioSCSIDevice *virtio_bdevice =3D g_new0(QVirtioSCSIDevice, 1); + QVirtioSCSI *interface =3D &virtio_bdevice->scsi; + + interface->vdev =3D virtio_dev; + + virtio_bdevice->obj.destructor =3D qvirtio_scsi_device_destroy; + virtio_bdevice->obj.get_driver =3D 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 =3D object; + if (!g_strcmp0(interface, "virtio-scsi")) { + return &v_scsi->scsi; + } + + printf("%s not present in virtio-scsi-pci\n", interface); + abort(); +} + +static void *virtio_scsi_pci_create(void *pci_bus, + QGuestAllocator *t_alloc, + void *addr) +{ + QVirtioSCSIPCI *virtio_spci =3D g_new0(QVirtioSCSIPCI, 1); + QVirtioSCSI *interface =3D &virtio_spci->scsi; + QOSGraphObject *obj =3D &virtio_spci->pci_vdev.obj; + + virtio_pci_init(&virtio_spci->pci_vdev, pci_bus, addr); + interface->vdev =3D &virtio_spci->pci_vdev.vdev; + + g_assert_cmphex(interface->vdev->device_type, =3D=3D, VIRTIO_ID_SCSI); + + obj->get_driver =3D qvirtio_scsi_pci_get_driver; + + return obj; +} + +static void virtio_scsi(void) +{ + QPCIAddress addr =3D { + .devfn =3D QPCI_DEVFN(4, 0), + }; + + QOSGraphEdgeOptions opts =3D { + .before_cmd_line =3D "-drive id=3Ddrv0,if=3Dnone,file=3Dnull-co://= ,format=3Draw", + .after_cmd_line =3D "-device scsi-hd,bus=3Dvs0.0,drive=3Ddrv0", + }; + + /* virtio-scsi-device */ + opts.extra_device_opts =3D "id=3Dvs0"; + qos_node_create_driver("virtio-scsi-device", + virtio_scsi_device_create); + qos_node_consumes("virtio-scsi-device", "virtio", &opts); + qos_node_produces("virtio-scsi-device", "virtio-scsi"); + + /* virtio-scsi-pci */ + opts.extra_device_opts =3D "id=3Dvs0,addr=3D04.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", "virtio-scsi"); +} + +libqos_init(virtio_scsi); diff --git a/tests/libqos/virtio-scsi.h b/tests/libqos/virtio-scsi.h new file mode 100644 index 0000000000..17a47beddc --- /dev/null +++ b/tests/libqos/virtio-scsi.h @@ -0,0 +1,39 @@ +/* + * libqos driver framework + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito + * + * 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 + */ + +#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; +}; --=20 2.17.1