From nobody Sun Nov 9 22:28:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551981399691971.1800579792156; Thu, 7 Mar 2019 09:56:39 -0800 (PST) Received: from localhost ([127.0.0.1]:56452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1xFx-0007V4-JB for importer@patchew.org; Thu, 07 Mar 2019 12:56:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wqp-0003Fn-Mu for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wqn-000873-Pu for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:35 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:53657) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wql-00085D-VE for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:33 -0500 Received: by mail-wm1-x32b.google.com with SMTP id e74so10067355wmg.3 for ; Thu, 07 Mar 2019 09:30:31 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id d206sm9979753wmc.11.2019.03.07.09.30.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 09:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KvV9AwCyKpmUMPxFMYV4iWpmCw7F9sjtnGD1mBUuCFA=; b=C0cY0YGDF1/4koBfrVubpGGTwMvd3nCJ1Ej7DbxaMpccJwrT3hBRJJI+rrDkOH0dVd tpWuWj2290SjkyxLpaRSSROcqvH7LlpR8pQPBIv71Qxw5vWWmB4DIhocS6v7tMRCLryP oGvPtg1+R8CpDzqU9JUa55LYjk0Px8st48PA/LYyhQJVw0C2FGkKgJspD/EvrFVSLbkc YNHCWRUui/N7j3HHNucqLpTjNb8fFJG2YK1M+yOq8hDYXS/8C2xWZVOnHItreGKadj34 kpvRn81+yCFwS3N9qXDd59FlGZTKIs/CvczCLdqkSEXpNvpmVLs53vKKcHIuJYf4mpaq Uf5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=KvV9AwCyKpmUMPxFMYV4iWpmCw7F9sjtnGD1mBUuCFA=; b=ukCqsD7EVAHChuHlNr7pgS3PvQz4bbAZs5vyJws2pBFgIxxRbFoNitOLPENxrxqOYx gQ/CWL3AdRVHC9JxS2dRaarVlY6w7CQ9DMejPxRV/xri8KSBNJ1NJzRjn1NS4nG9GBNs kC+BP2M5wCNiNd5lTD9hl5Ib9e2qm2Ndy/lwm6Kt9rG5W2VX1ymWHOC7zu3AT/OjXCrP eYXqtG/EYJ900QHxVACAgdJMWxw2DHrcB7SHb5yOcNhg3Q/sftg3NKW4r1O4WsLvTUKk lLMhNqn05+55op+X2ssEzH1sMPE2nPPdGJdBzt0oz6Or4JyC63ts8xVjKGDYR06kjvDT uMlQ== X-Gm-Message-State: APjAAAVoDHxD/GG/td6nA/hinvsheOxWVVCY5WywYWAcVBfUXnOHpLaG eBVxYxInzKnzvHUOWxt+4dRFRPZC X-Google-Smtp-Source: APXvYqz7SACAKa5WN0fyBR9nUVNM3p0MXUFpe2IvhmZArE/XY6WDgQbliMJ7EdMwPhXZ8DPb29jRgQ== X-Received: by 2002:a1c:48f:: with SMTP id 137mr6189640wme.21.1551979830514; Thu, 07 Mar 2019 09:30:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:29:29 +0100 Message-Id: <1551979804-6060-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> References: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 22/57] tests/libqos: remove global_qtest from virtio endianness checks 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: thuth@redhat.com, lviver@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is needed to support migration tests with qgraph. Signed-off-by: Paolo Bonzini --- tests/libqos/virtio-pci.c | 11 ++++++++++- tests/libqos/virtio.c | 5 +++++ tests/libqos/virtio.h | 8 ++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index 6bcdbbb..0b58b74 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -43,6 +43,14 @@ typedef struct QVirtioPCIForeachData { void *user_data; } QVirtioPCIForeachData; =20 +static inline bool qvirtio_pci_is_big_endian(QVirtioPCIDevice *dev) +{ + QPCIBus *bus =3D dev->pdev->bus; + + /* FIXME: virtio 1.0 is always little-endian */ + return qtest_big_endian(bus->qts); +} + void qvirtio_pci_device_free(QVirtioPCIDevice *dev) { g_free(dev->pdev); @@ -56,6 +64,7 @@ static void qvirtio_pci_init_from_pcidev(QVirtioPCIDevice= *dev, QPCIDevice *pci_ dev->config_msix_entry =3D -1; =20 dev->vdev.bus =3D &qvirtio_pci; + dev->vdev.big_endian =3D qvirtio_pci_is_big_endian(dev); =20 /* each virtio-xxx-pci device should override at least this function */ dev->obj.get_driver =3D NULL; @@ -99,7 +108,7 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d= , uint64_t off) * so with a big-endian guest the order has been reversed, * reverse it again * virtio-1.0 is always little-endian, like PCI, but this - * case will be managed inside qvirtio_is_big_endian() + * case will be managed inside qvirtio_pci_is_big_endian() */ =20 static uint16_t qvirtio_pci_config_readw(QVirtioDevice *d, uint64_t off) diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c index c1ff020..5a62950 100644 --- a/tests/libqos/virtio.c +++ b/tests/libqos/virtio.c @@ -372,3 +372,8 @@ void qvirtio_start_device(QVirtioDevice *vdev) qvirtio_set_acknowledge(vdev); qvirtio_set_driver(vdev); } + +bool qvirtio_is_big_endian(QVirtioDevice *d) +{ + return d->big_endian; +} diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index 2c68668..7f0f9dd 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -21,6 +21,7 @@ typedef struct QVirtioDevice { const QVirtioBus *bus; /* Device type */ uint16_t device_type; + bool big_endian; } QVirtioDevice; =20 typedef struct QVirtQueue { @@ -90,12 +91,6 @@ struct QVirtioBus { void (*virtqueue_kick)(QVirtioDevice *d, QVirtQueue *vq); }; =20 -static inline bool qvirtio_is_big_endian(QVirtioDevice *d) -{ - /* FIXME: virtio 1.0 is always little-endian */ - return qtest_big_endian(global_qtest); -} - static inline uint32_t qvring_size(uint32_t num, uint32_t align) { return ((sizeof(struct vring_desc) * num + sizeof(uint16_t) * (3 + num) @@ -109,6 +104,7 @@ uint32_t qvirtio_config_readl(QVirtioDevice *d, uint64_= t addr); uint64_t qvirtio_config_readq(QVirtioDevice *d, uint64_t addr); uint32_t qvirtio_get_features(QVirtioDevice *d); void qvirtio_set_features(QVirtioDevice *d, uint32_t features); +bool qvirtio_is_big_endian(QVirtioDevice *d); =20 void qvirtio_reset(QVirtioDevice *d); void qvirtio_set_acknowledge(QVirtioDevice *d); --=20 1.8.3.1