From nobody Tue Nov 4 22:01:31 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 1533567665827145.19351601126095; Mon, 6 Aug 2018 08:01:05 -0700 (PDT) Received: from localhost ([::1]:34496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmh0K-00034x-Jc for importer@patchew.org; Mon, 06 Aug 2018 11:01:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgbJ-0005Hz-Hs for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgbI-00013C-2Z for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:13 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:35059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgbH-00011b-P1 for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:12 -0400 Received: by mail-ed1-x543.google.com with SMTP id e6-v6so5263051edr.2 for ; Mon, 06 Aug 2018 07:35:11 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:35:10 -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=FpoPVWyaVMqPCz27Tni/YuqUENG3IXvvf5S1eO2uMr0=; b=qeqX9bAemsmRZro/GmODryA8Us3ZIrTaLe2RQWgM9GIV4AnVotlwRg+flFiLEi+vnm I6zXwiG1LtzJAxCtKHQ7mFe5PaBOadVhfvmBn0nWfP/htj8VJ234l0mVxLvW4SHM/1WS QT5iMTR32MFc4Ap/b37XKHtyqSLoDoM8nRorFLJfrX4+xMhDcsgUv4t7OnwRpVtNKwxz Ow9mFtmGJOqEw9v1HnAnNLdPbaO3wsz74KoGF2yg6iWO0MvGoju8QoIPsUyeZYDdc3gb Npjzx2lbV4c2fgPQnlsyxMp/Q4+tkN6QeVr6eGIhgZtkM/mAuHVTzeSwaqmQi5bmb2IH FuiA== 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=FpoPVWyaVMqPCz27Tni/YuqUENG3IXvvf5S1eO2uMr0=; b=NMx3+B698VpeXx1nP6Julen7Ixccq15ZHiDnur++EJQ3PKLX2kRigyklWT+YVruSKG 8GXHiOGU3JFIhpgj9KZSpACbgDrcDLm6BolpHAnsTdt60AUey7aEpictxpZ9J7XAXFrY utiLajGWcx0sVQtG+ePlCVaHqyaibFkbBDEfTfsob0FIQUyPVxZSgRpYK0dpxHkDTE/k lAxmA33fSwCuaZxQ1k5p9/aNDwgC2cFEohecL3EfowbmijlYq5mNHuqfZTtEq4NKohid grJM9CFsHR8L0Rgblr0t5yhqmNcTKaa4rUzwsByT8dbTMA+s6qmK4bKgYG0pXDHGPBRJ G99g== X-Gm-Message-State: AOUpUlFW7rJar6OTa+WlE6V/qVuAZTLMB4Qd2bZgpfu5LTHUM7JEeQSF +WTIrZ4skWi4DbxKCu/jgcU= X-Google-Smtp-Source: AAOMgpcW9civzZ2+/8VRngpiSgc1xvmM74I143F2nGdQy6yCOLZeG7cI8zC1o7sOPhTTA8SXeMqD1w== X-Received: by 2002:a50:a8e4:: with SMTP id k91-v6mr18856044edc.4.1533566110731; Mon, 06 Aug 2018 07:35:10 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:34:06 +0200 Message-Id: <20180806143412.27722-29-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 28/34] test/qgraph: virtio-blk 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-blk-pci and virtio-blk-device. Both nodes produce virtio-blk, but virtio-blk-pci receives a pci-bus and uses virtio-pci QOSGraphObject and functions, while virtio-blk-device receives a virtio and implements its own functions Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 1 + tests/libqos/virtio-blk.c | 126 ++++++++++++++++++++++++++++++++++++++ tests/libqos/virtio-blk.h | 40 ++++++++++++ 3 files changed, 167 insertions(+) create mode 100644 tests/libqos/virtio-blk.c create mode 100644 tests/libqos/virtio-blk.h diff --git a/tests/Makefile.include b/tests/Makefile.include index 3a1a99b8c8..1d68e7d223 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -769,6 +769,7 @@ libqgraph-virtio-obj-y =3D tests/libqos/virtio-serial.o libqgraph-virtio-obj-y +=3D tests/libqos/virtio-9p.o 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 =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-blk.c b/tests/libqos/virtio-blk.c new file mode 100644 index 0000000000..991fa01809 --- /dev/null +++ b/tests/libqos/virtio-blk.c @@ -0,0 +1,126 @@ +/* + * 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_blk.h" +#include "libqos/qgraph.h" +#include "libqos/virtio-blk.h" + +#define PCI_SLOT 0x04 +#define PCI_FN 0x00 + +/* virtio-blk-device */ +static void qvirtio_blk_device_destroy(QOSGraphObject *obj) +{ + QVirtioBlkDevice *v_blk =3D (QVirtioBlkDevice *) obj; + g_free(v_blk); +} + +static void *qvirtio_blk_device_get_driver(void *object, + const char *interface) +{ + QVirtioBlkDevice *v_blk =3D object; + if (!g_strcmp0(interface, "virtio-blk")) { + return &v_blk->blk; + } + + printf("%s not present in virtio-blk-device\n", interface); + abort(); +} + +static void *virtio_blk_device_create(void *virtio_dev, + QGuestAllocator *t_alloc, + void *addr) +{ + QVirtioBlkDevice *virtio_blk =3D g_new0(QVirtioBlkDevice, 1); + QVirtioBlk *interface =3D &virtio_blk->blk; + + interface->vdev =3D virtio_dev; + + virtio_blk->obj.destructor =3D qvirtio_blk_device_destroy; + virtio_blk->obj.get_driver =3D qvirtio_blk_device_get_driver; + + return &virtio_blk->obj; +} + +/* virtio-blk-pci */ +static void *qvirtio_blk_pci_get_driver(void *object, const char *interfac= e) +{ + QVirtioBlkPCI *v_blk =3D object; + if (!g_strcmp0(interface, "virtio-blk")) { + return &v_blk->blk; + } + + /* implicit contains */ + if (!g_strcmp0(interface, "pci-device")) { + return v_blk->pci_vdev.pdev; + } + + printf("%s not present in virtio-blk-pci\n", interface); + abort(); +} + +static void *virtio_blk_pci_create(void *pci_bus, QGuestAllocator *t_alloc, + void *addr) +{ + QVirtioBlkPCI *virtio_blk =3D g_new0(QVirtioBlkPCI, 1); + QVirtioBlk *interface =3D &virtio_blk->blk; + QOSGraphObject *obj =3D &virtio_blk->pci_vdev.obj; + + virtio_pci_init(&virtio_blk->pci_vdev, pci_bus, addr); + interface->vdev =3D &virtio_blk->pci_vdev.vdev; + + g_assert_cmphex(interface->vdev->device_type, =3D=3D, VIRTIO_ID_BLOCK); + + obj->get_driver =3D qvirtio_blk_pci_get_driver; + + return obj; +} + +static void virtio_blk(void) +{ + /* FIXME: every test using these two nodes needs to setup a + * -drive,id=3Ddrive0 otherwise QEMU is not going to start */ + + char *arg =3D g_strdup_printf("id=3Ddrv0,drive=3Ddrive0,addr=3D%x.%x", + PCI_SLOT, PCI_FN); + + QPCIAddress addr =3D { + .devfn =3D QPCI_DEVFN(PCI_SLOT, PCI_FN), + }; + + QOSGraphEdgeOptions opts =3D { }; + + /* virtio-blk-device */ + opts.extra_device_opts =3D "drive=3Ddrive0"; + qos_node_create_driver("virtio-blk-device", virtio_blk_device_create); + qos_node_consumes("virtio-blk-device", "virtio", &opts); + qos_node_produces("virtio-blk-device", "virtio-blk"); + + /* virtio-blk-pci */ + opts.extra_device_opts =3D arg; + add_qpci_address(&opts, &addr); + qos_node_create_driver("virtio-blk-pci", virtio_blk_pci_create); + qos_node_consumes("virtio-blk-pci", "pci-bus", &opts); + qos_node_produces("virtio-blk-pci", "virtio-blk"); + + g_free(arg); +} + +libqos_init(virtio_blk); diff --git a/tests/libqos/virtio-blk.h b/tests/libqos/virtio-blk.h new file mode 100644 index 0000000000..dc258496ba --- /dev/null +++ b/tests/libqos/virtio-blk.h @@ -0,0 +1,40 @@ +/* + * 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 QVirtioBlk QVirtioBlk; +typedef struct QVirtioBlkPCI QVirtioBlkPCI; +typedef struct QVirtioBlkDevice QVirtioBlkDevice; + +/* virtqueue is created in each test */ +struct QVirtioBlk { + QVirtioDevice *vdev; +}; + +struct QVirtioBlkPCI { + QVirtioPCIDevice pci_vdev; + QVirtioBlk blk; +}; + +struct QVirtioBlkDevice { + QOSGraphObject obj; + QVirtioBlk blk; +}; --=20 2.17.1