From nobody Sat Feb 7 09:32:11 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=1566905263; cv=none; d=zoho.com; s=zohoarc; b=mo9n085Vir3g8eAIN/FBcSC1SwOoEikt+VN2VGcyp2BFGSPRgKhRS2JzOYOHMzyXBnDpUHlt3Q/tBWwDc/citL5z9PLM1lj8HWOosruAqBmWlwn+tjfVdCUxXKpTNw2tWcM9w97jQ+JxHSeE78w7ld28pD3u89qEm6Emg3CqwhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566905263; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=JXZ7f52KirhCdrkrQeUODelh1XQJ+nXUR7/CQRi0d70=; b=UF+xH7IQjHV5sPqajoIxKyLRVjzM5IPvCbtZUtaHSesr6ZaYD/RXiFbHf9eVFifY2+upgsOZUsEhUXRQHs0am4vovCHMcg/Urgz/yHoTTQa+dt/lBugJhzmLZ9Q4sCTOTXu5UHQji596sYvLxDIAynMj+l6hjwNj19CeUDZCnTo= 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 1566905263282334.4431447254491; Tue, 27 Aug 2019 04:27:43 -0700 (PDT) Received: from localhost ([::1]:49788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2ZdW-0000Oy-32 for importer@patchew.org; Tue, 27 Aug 2019 07:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41060) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2ZcG-0008Fl-TI for qemu-devel@nongnu.org; Tue, 27 Aug 2019 07:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2ZcF-00050O-Rv for qemu-devel@nongnu.org; Tue, 27 Aug 2019 07:26:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i2ZcF-000502-Mu for qemu-devel@nongnu.org; Tue, 27 Aug 2019 07:26:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07C5E59465; Tue, 27 Aug 2019 11:26:23 +0000 (UTC) Received: from thuth.com (ovpn-116-79.ams2.redhat.com [10.36.116.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD18E5D713; Tue, 27 Aug 2019 11:26:21 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 27 Aug 2019 13:26:17 +0200 Message-Id: <20190827112617.600-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 27 Aug 2019 11:26:23 +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] tests/libqos/e1000e: Make e1000e libqos functions 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: Laurent Vivier , Paolo Bonzini , Dmitry Fleytman 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" libqos library functions should never depend on functions (like memread(), memwrite() or clock_step()) that require global_qtest to be set, since library functions might get used in qtests that track multiple states, too. Thus let's replace the global_qtest-related functions with their independent counterparts. Signed-off-by: Thomas Huth --- tests/libqos/e1000e.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/libqos/e1000e.c b/tests/libqos/e1000e.c index 1d0592974e..560e7a2bb2 100644 --- a/tests/libqos/e1000e.c +++ b/tests/libqos/e1000e.c @@ -85,26 +85,32 @@ static uint32_t e1000e_macreg_read(QE1000E *d, uint32_t= reg) =20 void e1000e_tx_ring_push(QE1000E *d, void *descr) { + QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); uint32_t tail =3D e1000e_macreg_read(d, E1000E_TDT); uint32_t len =3D e1000e_macreg_read(d, E1000E_TDLEN) / E1000E_TXD_LEN; =20 - memwrite(d->tx_ring + tail * E1000E_TXD_LEN, descr, E1000E_TXD_LEN); + qtest_memwrite(d_pci->pci_dev.bus->qts, d->tx_ring + tail * E1000E_TXD= _LEN, + descr, E1000E_TXD_LEN); e1000e_macreg_write(d, E1000E_TDT, (tail + 1) % len); =20 /* Read WB data for the packet transmitted */ - memread(d->tx_ring + tail * E1000E_TXD_LEN, descr, E1000E_TXD_LEN); + qtest_memread(d_pci->pci_dev.bus->qts, d->tx_ring + tail * E1000E_TXD_= LEN, + descr, E1000E_TXD_LEN); } =20 void e1000e_rx_ring_push(QE1000E *d, void *descr) { + QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); uint32_t tail =3D e1000e_macreg_read(d, E1000E_RDT); uint32_t len =3D e1000e_macreg_read(d, E1000E_RDLEN) / E1000E_RXD_LEN; =20 - memwrite(d->rx_ring + tail * E1000E_RXD_LEN, descr, E1000E_RXD_LEN); + qtest_memwrite(d_pci->pci_dev.bus->qts, d->rx_ring + tail * E1000E_RXD= _LEN, + descr, E1000E_RXD_LEN); e1000e_macreg_write(d, E1000E_RDT, (tail + 1) % len); =20 /* Read WB data for the packet received */ - memread(d->rx_ring + tail * E1000E_RXD_LEN, descr, E1000E_RXD_LEN); + qtest_memread(d_pci->pci_dev.bus->qts, d->rx_ring + tail * E1000E_RXD_= LEN, + descr, E1000E_RXD_LEN); } =20 static void e1000e_foreach_callback(QPCIDevice *dev, int devfn, void *data) @@ -123,7 +129,7 @@ void e1000e_wait_isr(QE1000E *d, uint16_t msg_id) if (qpci_msix_pending(&d_pci->pci_dev, msg_id)) { return; } - clock_step(10000); + qtest_clock_step(d_pci->pci_dev.bus->qts, 10000); } while (g_get_monotonic_time() < end_time); =20 g_error("Timeout expired"); --=20 2.18.1