From nobody Wed Nov 12 02:08:44 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; 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=1567491688; cv=none; d=zoho.com; s=zohoarc; b=hq/5Q71/23eaBMJxz96ed6obReFPnkG3B2xyNeA6qhpa9ptxTZd2qSmYDAMAqRjd14hiOAALAI6Db2Fa10jVtWkfZGhhgviFV1ITaX73ZuS6H18o/y9DRJuUZns4UOURudBoYNHIWFXGpu1IPrp+PGBqdsxx1k0ZxEdKZ6fH2Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567491688; 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=JXZ7f52KirhCdrkrQeUODelh1XQJ+nXUR7/CQRi0d70=; b=TYeuG9yTDEjLlDd7ATQYZSqjMQOVpKfkztYHtXf9IV8NiVVoIUC788YmS4d+8LlN6klkioAYZQLbNiArsMbAwfYYBFBoZtJ8BYB9Mbck6G51RMS1xcJdJ2EwQk5CfqqfJxlJ4dT3vUFyjGSsW+jHWZ+5Z4JFz6sPwJcojv6SUtA= 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 1567491688589218.53641877185578; Mon, 2 Sep 2019 23:21:28 -0700 (PDT) Received: from localhost ([::1]:41964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i52By-0000c0-RR for importer@patchew.org; Tue, 03 Sep 2019 02:21:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57017) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i529h-0007CJ-DJ for qemu-devel@nongnu.org; Tue, 03 Sep 2019 02:19:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i529f-0003Z2-GW for qemu-devel@nongnu.org; Tue, 03 Sep 2019 02:19:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46992) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i529e-0003YB-VA for qemu-devel@nongnu.org; Tue, 03 Sep 2019 02:19:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFEF418C4267 for ; Tue, 3 Sep 2019 06:19:01 +0000 (UTC) Received: from thuth.com (ovpn-116-80.ams2.redhat.com [10.36.116.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D532600C6; Tue, 3 Sep 2019 06:19:00 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Tue, 3 Sep 2019 08:18:45 +0200 Message-Id: <20190903061849.21493-3-thuth@redhat.com> In-Reply-To: <20190903061849.21493-1-thuth@redhat.com> References: <20190903061849.21493-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 03 Sep 2019 06:19:01 +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/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: Paolo Bonzini , Stefan Hajnoczi 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 Reviewed-by: Laurent Vivier --- 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