From nobody Sun Feb 8 07:14:36 2026 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1565688760; cv=none; d=zoho.com; s=zohoarc; b=eAnzDiIm9xpSALYPxZlrHJTZ2fsWRrpAa2UmahjjIGY/PlJNRreDx51dSL5lv51yZsXfQHARqYPZeZRjP33WIZUd6Lw9bXoWzsX5463tMbbYF8p9RM9wU5/Hmlg93JKKeMBd06o4ULaRlc5zILUcBEVirWe2MbUVFkSWq0LsEB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688760; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FeS3SSUCXbJm4J2LC9zaSsasVowr1v5qUPlIfDhEz9Y=; b=lhPbs8nnKVDPrpultT6yEug9eje2otKoNCZtOqdrqV0XeIkBdL4NLgd0tZdJ5XaFE/AESFxFOK7FqgEftVnemCqIgYjmKJHFf7WT9S18acwHZwPdkzHjtG9xgimcsl9I9qQo1fHBpJ8z6XA8MadeZ0HKsLQ1343uWIGVCUl8Ynw= ARC-Authentication-Results: i=1; mx.zoho.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565688760916806.298936678278; Tue, 13 Aug 2019 02:32:40 -0700 (PDT) Received: from localhost ([::1]:50570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTAW-0008Hh-2m for importer@patchew.org; Tue, 13 Aug 2019 05:32:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53416) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9A-0006Qi-MJ for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT99-00059t-Oe for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT95-000583-E8; Tue, 13 Aug 2019 05:31:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B01DF30832DC; Tue, 13 Aug 2019 09:31:10 +0000 (UTC) Received: from thuth.com (ovpn-116-154.ams2.redhat.com [10.36.116.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F3967D49A; Tue, 13 Aug 2019 09:31:07 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:43 +0200 Message-Id: <20190813093047.27948-3-thuth@redhat.com> In-Reply-To: <20190813093047.27948-1-thuth@redhat.com> References: <20190813093047.27948-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 13 Aug 2019 09:31:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/6] tests/libqos: Make virtio-pci code independent from global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Amit Shah , John Snow , Jason Wang , "Dr. David Alan Gilbert" , Markus Armbruster , Greg Kurz , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The libqos library functions should never depend on global_qtest, since these functions might be used in tests that track multiple test states. So let's use the test state of the QPCIDevice instead. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake --- tests/libqos/virtio-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index a622ca26ca..3f55c047a0 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -138,9 +138,9 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioDev= ice *d, QVirtQueue *vq) /* No ISR checking should be done if masked, but read anyway */ return qpci_msix_pending(dev->pdev, vqpci->msix_entry); } else { - data =3D readl(vqpci->msix_addr); + data =3D qtest_readl(dev->pdev->bus->qts, vqpci->msix_addr); if (data =3D=3D vqpci->msix_data) { - writel(vqpci->msix_addr, 0); + qtest_writel(dev->pdev->bus->qts, vqpci->msix_addr, 0); return true; } else { return false; @@ -162,9 +162,9 @@ static bool qvirtio_pci_get_config_isr_status(QVirtioDe= vice *d) /* No ISR checking should be done if masked, but read anyway */ return qpci_msix_pending(dev->pdev, dev->config_msix_entry); } else { - data =3D readl(dev->config_msix_addr); + data =3D qtest_readl(dev->pdev->bus->qts, dev->config_msix_add= r); if (data =3D=3D dev->config_msix_data) { - writel(dev->config_msix_addr, 0); + qtest_writel(dev->pdev->bus->qts, dev->config_msix_addr, 0= ); return true; } else { return false; --=20 2.18.1