From nobody Tue Nov 4 22:00:42 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 153356672130491.83653670453509; Mon, 6 Aug 2018 07:45:21 -0700 (PDT) Received: from localhost ([::1]:34406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgl6-00056n-1W for importer@patchew.org; Mon, 06 Aug 2018 10:45:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgb1-00051t-3M for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgaz-0000sX-PU for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:55 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:42101) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgaz-0000sJ-GC for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:34:53 -0400 Received: by mail-ed1-x543.google.com with SMTP id r4-v6so5237518edp.9 for ; Mon, 06 Aug 2018 07:34:53 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.126]) by smtp.gmail.com with ESMTPSA id x13-v6sm14615157edx.17.2018.08.06.07.34.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:34:51 -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=ixVmiwPEszxZNvRan4H/pRZwrA75ELBlpSzFIvJR/EQ=; b=uIMNeHznh/MQs7tlQShw1Auf7xAE+dNDaSt8P2A9WacT7WLg3Hz7+kvHsTZNnn9vKF MDT+IlMOlSm4+WtIT9J/ONvqtguggf62+ki0eK4ZnhT797ZHC7OsZW+YiBORDPNHPfU4 cQrVGWkWFPvtWL1VD91VVAxWp/CHqYYmA24pOKe0KbFkAK4dQ+Q3U61RgyAtAexhfZOh X3I/7c6hMdkX6sEL+Gi4i1PFGaGnWPMuXaAJ+SFQnHbQm43ZR1bWOYtcsTsMxwMxPRLU 15eUS2mbEM0Mg99kFZH1EgGnhiFKUWPWTqVgo9+cKCpwpWqadYiqLvEheQ2majNl2kR9 p7tw== 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=ixVmiwPEszxZNvRan4H/pRZwrA75ELBlpSzFIvJR/EQ=; b=nH+4kqymrcNH70NIHz1qMqdsZ0oaj1IbxQUlxTOevAAorrh+sqxjoR4iQRaU24WggY 6uBWU0ciTLwLVp14k8SRsmJ9F1xOtPrF3q9YxbrPKHcy6GHoLmPY/tM+9663gKvgBoYE R/SkoJSNrve0ULq/ZKtpLjUVTCwgqIC+cbDSXrLGh+V7v4/MuhG6RKZFglS/xyOMhVqn XeElaB4vHXvRVD5a8cI5HLV5zs2fwcTf3uSZYG2bYrth69OmI49tssGtx1DuG25/dhKa oXl09Vs7rs2n7B1llKcZZGVb2FMqjR6fpqTr34ohvDZDiSmkgOAhvdKBIOnbk1ayKAcv 6HQA== X-Gm-Message-State: AOUpUlFsFHZ/gVVPRd1PRrDKNTuTz3ohmBDO5XUDJepDYkCht3a4++9p U8wyI5TBpDF9hmiVdHDoeGWTOOrm X-Google-Smtp-Source: AAOMgpeK/4x6qW4YbFVr2OAqZYT5I9mrnjv+NSxeGB8v2bll5BlN/UiFPgedDMl0P5jUsVQCl2M8eQ== X-Received: by 2002:a50:9818:: with SMTP id g24-v6mr19011283edb.174.1533566092463; Mon, 06 Aug 2018 07:34:52 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:33:51 +0200 Message-Id: <20180806143412.27722-14-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 13/34] test/qgraph: virtio_start_device function 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" This function is intended to group all the qvirtio_* functions that start the qvirtio devices. Applied in all tests using this combination of functions. Signed-off-by: Emanuele Giuseppe Esposito --- tests/libqos/virtio.c | 8 ++++++++ tests/libqos/virtio.h | 1 + tests/vhost-user-test.c | 5 +---- tests/virtio-9p-test.c | 6 +----- tests/virtio-blk-test.c | 18 ++---------------- tests/virtio-net-test.c | 6 +----- tests/virtio-scsi-test.c | 4 +--- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c index 0dad5c19ac..56007ef11b 100644 --- a/tests/libqos/virtio.c +++ b/tests/libqos/virtio.c @@ -365,3 +365,11 @@ const char *qvirtio_get_dev_type(void) return "pci"; } } + +void qvirtio_start_device(QVirtioDevice *vdev) +{ + qvirtio_reset(vdev); + qvirtio_set_acknowledge(vdev); + qvirtio_set_driver(vdev); + qvirtio_set_driver_ok(vdev); +} diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index 69b5b13840..2c68668de0 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -146,5 +146,6 @@ bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_= idx, uint32_t *len); void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx); =20 const char *qvirtio_get_dev_type(void); +void qvirtio_start_device(QVirtioDevice *vdev); =20 #endif diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index a01b81d342..c8270fa6ed 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -198,9 +198,7 @@ static void init_virtio_dev(TestServer *s, uint32_t fea= tures_mask) g_assert_nonnull(s->dev); =20 qvirtio_pci_device_enable(s->dev); - qvirtio_reset(&s->dev->vdev); - qvirtio_set_acknowledge(&s->dev->vdev); - qvirtio_set_driver(&s->dev->vdev); + qvirtio_start_device(&s->dev->vdev); =20 s->alloc =3D pc_alloc_init(global_qtest); =20 @@ -212,7 +210,6 @@ static void init_virtio_dev(TestServer *s, uint32_t fea= tures_mask) features =3D features & features_mask; qvirtio_set_features(&s->dev->vdev, features); =20 - qvirtio_set_driver_ok(&s->dev->vdev); } =20 static void uninit_virtio_dev(TestServer *s) diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index a2b31085f6..4f4a1fb8b4 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -65,14 +65,10 @@ static QVirtIO9P *qvirtio_9p_pci_start(void) v9p->dev =3D (QVirtioDevice *) dev; =20 qvirtio_pci_device_enable(dev); - qvirtio_reset(v9p->dev); - qvirtio_set_acknowledge(v9p->dev); - qvirtio_set_driver(v9p->dev); + qvirtio_start_device(v9p->dev); =20 v9p->vq =3D qvirtqueue_setup(v9p->dev, v9p->qs->alloc, 0); =20 - qvirtio_set_driver_ok(v9p->dev); - return v9p; } =20 diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 9be9ffb378..3e8f98e528 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -112,10 +112,7 @@ static QVirtioPCIDevice *virtio_blk_pci_init(QPCIBus *= bus, int slot) g_assert_cmphex(dev->pdev->devfn, =3D=3D, ((slot << 3) | PCI_FN)); =20 qvirtio_pci_device_enable(dev); - qvirtio_reset(&dev->vdev); - qvirtio_set_acknowledge(&dev->vdev); - qvirtio_set_driver(&dev->vdev); - + qvirtio_start_device(&dev->vdev); return dev; } =20 @@ -174,8 +171,6 @@ static void test_basic(QVirtioDevice *dev, QGuestAlloca= tor *alloc, (1u << VIRTIO_BLK_F_SCSI)); qvirtio_set_features(dev, features); =20 - qvirtio_set_driver_ok(dev); - /* Write and read with 3 descriptor layout */ /* Write request */ req.type =3D VIRTIO_BLK_T_OUT; @@ -329,7 +324,6 @@ static void pci_indirect(void) qvirtio_set_features(&dev->vdev, features); =20 vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); - qvirtio_set_driver_ok(&dev->vdev); =20 /* Write request */ req.type =3D VIRTIO_BLK_T_OUT; @@ -407,8 +401,6 @@ static void pci_config(void) capacity =3D qvirtio_config_readq(&dev->vdev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 - qvirtio_set_driver_ok(&dev->vdev); - qmp_discard_response("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); @@ -457,8 +449,6 @@ static void pci_msix(void) vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); qvirtqueue_pci_msix_setup(dev, vqpci, qs->alloc, 1); =20 - qvirtio_set_driver_ok(&dev->vdev); - qmp_discard_response("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); @@ -565,8 +555,6 @@ static void pci_idx(void) vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); qvirtqueue_pci_msix_setup(dev, vqpci, qs->alloc, 1); =20 - qvirtio_set_driver_ok(&dev->vdev); - /* Write request */ req.type =3D VIRTIO_BLK_T_OUT; req.ioprio =3D 1; @@ -715,9 +703,7 @@ static void mmio_basic(void) g_assert(dev !=3D NULL); g_assert_cmphex(dev->vdev.device_type, =3D=3D, VIRTIO_ID_BLOCK); =20 - qvirtio_reset(&dev->vdev); - qvirtio_set_acknowledge(&dev->vdev); - qvirtio_set_driver(&dev->vdev); + qvirtio_start_device(&dev->vdev); =20 alloc =3D generic_alloc_init(MMIO_RAM_ADDR, MMIO_RAM_SIZE, MMIO_PAGE_S= IZE); vq =3D qvirtqueue_setup(&dev->vdev, alloc, 0); diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index b285a262e9..b2a5f5a350 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -45,9 +45,7 @@ static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *bus= , int slot) g_assert_cmphex(dev->vdev.device_type, =3D=3D, VIRTIO_ID_NET); =20 qvirtio_pci_device_enable(dev); - qvirtio_reset(&dev->vdev); - qvirtio_set_acknowledge(&dev->vdev); - qvirtio_set_driver(&dev->vdev); + qvirtio_start_device(&dev->vdev); =20 return dev; } @@ -80,8 +78,6 @@ static void driver_init(QVirtioDevice *dev) (1u << VIRTIO_RING_F_INDIRECT_DESC) | (1u << VIRTIO_RING_F_EVENT_IDX)); qvirtio_set_features(dev, features); - - qvirtio_set_driver_ok(dev); } =20 static void rx_test(QVirtioDevice *dev, diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 037872bb98..1581b6926c 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -159,9 +159,7 @@ static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot) g_assert_cmphex(vs->dev->device_type, =3D=3D, VIRTIO_ID_SCSI); =20 qvirtio_pci_device_enable(dev); - qvirtio_reset(vs->dev); - qvirtio_set_acknowledge(vs->dev); - qvirtio_set_driver(vs->dev); + qvirtio_start_device(vs->dev); =20 vs->num_queues =3D qvirtio_config_readl(vs->dev, 0); =20 --=20 2.17.1