From nobody Wed May 7 12:54:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738596021; cv=none;
d=zohomail.com; s=zohoarc;
b=n3/D01BQsD0X4Y24RMnXWyuQXt1+dMAzO/9K8ns5oxSUxAnN/zz3+uhPinYXMEYBKGfFQYgyc6i3VqxbuTD3BbBt/i1+tNBY+HGf8S5Uvvkm0rwUZneiIfrsM3LbmbIEOQdCxMzAI6uZd8jeWIiBXakZanzW4rJ41lwJQLFWnGc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738596021;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=3UFLMzp9qGvO/TMJfobXhH747ty7fBk8K8S5c0aFteA=;
b=aWAr01qT/9N10pw7D62TwQ6EXX53PWi0xcF5W/ka6EqGHaMfqf6XWDXQVQHsRDd5QDKxwr8IeoYy1OJoGAkd1R73NXGeu+atYHqxpNlBdofR8n+VZEdCAbVmjvGfzHCgg6tuZAzs4HMam3o5o9CsIdvsecGLRIIYhrXGQgT386s=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<alex.bennee@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738596021508420.9654035881093;
Mon, 3 Feb 2025 07:20:21 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1texdX-0003iv-2f; Mon, 03 Feb 2025 09:41:19 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <alex.bennee@linaro.org>)
id 1texdC-0003Ts-Em
for qemu-devel@nongnu.org; Mon, 03 Feb 2025 09:40:59 -0500
Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <alex.bennee@linaro.org>)
id 1texd7-0002Li-8S
for qemu-devel@nongnu.org; Mon, 03 Feb 2025 09:40:57 -0500
Received: by mail-ed1-x532.google.com with SMTP id
4fb4d7f45d1cf-5d3cf094768so8280784a12.0
for <qemu-devel@nongnu.org>; Mon, 03 Feb 2025 06:40:52 -0800 (PST)
Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-ab6e47d21aasm763112666b.74.2025.02.03.06.40.49
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 03 Feb 2025 06:40:49 -0800 (PST)
Received: from draig.lan (localhost [IPv6:::1])
by draig.lan (Postfix) with ESMTP id C3E6D5FA53;
Mon, 3 Feb 2025 14:40:48 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738593651; x=1739198451; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=3UFLMzp9qGvO/TMJfobXhH747ty7fBk8K8S5c0aFteA=;
b=OJkpiYtD6E6GEmmqrI9dSgSRSlzrb1j0auefJdyFSeiqYpuBDUasJJj3HwdPcvDSPE
6pEwYe0KAWpsYLshitEQX+N+4YiOn2rMOMB1NFtoCt+FZRvYElZpS2fNZS7ExCP7JY5c
XZbP1GFNt8pHc9DPY436eyYtKtU6BxsrKU43mEAnLpf7C6AL2+l4oDEcJrn7nAOUpgdj
/7yAZ8AP7qrmOkxjhWGoV3GmVJCrvr4977H1EpNR/kgvmXA+JHJ3VH/ArXjWccPr/nit
YzFk4/EQGoQNURCHp0UKHH93ir/V9AsLjTNXh/JtL8g2DMgm4C/40GkxrpDxnfYU7BoW
CmxA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738593651; x=1739198451;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=3UFLMzp9qGvO/TMJfobXhH747ty7fBk8K8S5c0aFteA=;
b=kYkD/i1RAZIo6CB/7mi2Y5N86eUGxDbjJzArNzwzw6QxqJzZGpo4EUWu7RT1Q+Z1rA
vcK86Ma4cdYh+XvyvQ/7iIFiyZvGprNzBZn9DV1ZFDQKozwmKai12tp3ZdmMThGC5lTi
LlZDa44sCUFoN2114w9XhaWrYRgrGlVwKfxptF7NG5AJadkaHyHQ7DEa4QNlZsoX5rhN
UKOZRdrfhz4uxc9eZHwk0vR+KkKTVXdzND8/HsZrFe0KgdTkw7ysL4zJaisOlkcVGQh0
7GMMU8BVa8JLbBCfp1k/0doEOV56P6vt6jrKhnQhwKbwLdxcdwfsSupi3uLI46/8/Lhu
ychA==
X-Gm-Message-State: AOJu0Yx9zA+i+Obd3+JaGq6bog/PNPSPK/u8MFWQlJSQAiPLC+vbYDhz
4P/0dXFGKiKsw/Stc4rfxB9CZ8SLixbiwEBl9XDFY9kSDNLj/tdAMaScfYvhGxQ=
X-Gm-Gg: ASbGnctH7FfEyOce+uuNuW5pN901jwmC8fV5VkpYDJ+jt0q03CH1dk++udsuaoJpoHr
YvX/iL34Z2/gYOt7O8TGjd/Cc7kraPYh2vDDct4hOgcCi7vjlRxDzv0EpkGA8Ipg4UkFzCnvUya
/63igAfHa7I6P3mTb8ZL9WrGMPJ6ohwFP4V/rLsy5Ge3jEqUGTIcfxm+zPaxgZJEGYwtwWBr0K3
Ilb30eQfIHsSyEbH127ZltC++I9mk+xyCdwXzmKziQ8d54xh9lNx3w6K+H2WrLKJzjBk5f1nzjP
j2ty0RyCCFW295MjIg==
X-Google-Smtp-Source:
AGHT+IG0zaflt4qSNl3JLzdRpFKBH69FVSs2gb6xQjdVTDOzbslkKT/244mgkH7SbwOCFoGmQQLEcQ==
X-Received: by 2002:a17:907:72c4:b0:aa6:5eae:7ed6 with SMTP id
a640c23a62f3a-ab6cfce8dbbmr2236592666b.13.1738593651441;
Mon, 03 Feb 2025 06:40:51 -0800 (PST)
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, Mahmoud Mandour <ma.mandourr@gmail.com>,
Thomas Huth <thuth@redhat.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
Hao Wu <wuhaotsh@google.com>, Peter Xu <peterx@redhat.com>,
Warner Losh <imp@bsdimp.com>,
Pierrick Bouvier <pierrick.bouvier@linaro.org>, qemu-arm@nongnu.org,
Harsh Prateek Bora <harshpb@linux.ibm.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Palmer Dabbelt <palmer@dabbelt.com>, Kyle Evans <kevans@freebsd.org>,
Laurent Vivier <laurent@vivier.eu>, Riku Voipio <riku.voipio@iki.fi>,
Bin Meng <bmeng.cn@gmail.com>, qemu-rust@nongnu.org,
Laurent Vivier <lvivier@redhat.com>,
Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Weiwei Li <liwei1518@gmail.com>,
qemu-riscv@nongnu.org, Fabiano Rosas <farosas@suse.de>,
Tyrone Ting <kfting@nuvoton.com>, Paolo Bonzini <pbonzini@redhat.com>,
Nicholas Piggin <npiggin@gmail.com>, Alexandre Iooss <erdnaxe@crans.org>
Subject: [PATCH 02/18] tests/qtest: don't attempt to clock_step while waiting
for virtio ISR
Date: Mon, 3 Feb 2025 14:40:32 +0000
Message-Id: <20250203144048.2131117-3-alex.bennee@linaro.org>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250203144048.2131117-1-alex.bennee@linaro.org>
References: <20250203144048.2131117-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=2a00:1450:4864:20::532;
envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738596022881019000
This replicates the changes from 92cb8f8bf6 (tests/qtest: remove
clock_steps from virtio tests) as there are no timers in the virtio
code. We still busy wait and timeout though.
Signed-off-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
---
v2
- fix trailing space
---
tests/qtest/libqos/virtio-pci-modern.c | 6 ++----
tests/qtest/libqos/virtio-pci.c | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/tests/qtest/libqos/virtio-pci-modern.c b/tests/qtest/libqos/vi=
rtio-pci-modern.c
index 18d118866f..4e67fcbd5d 100644
--- a/tests/qtest/libqos/virtio-pci-modern.c
+++ b/tests/qtest/libqos/virtio-pci-modern.c
@@ -173,13 +173,11 @@ static bool get_config_isr_status(QVirtioDevice *d)
=20
static void wait_config_isr_status(QVirtioDevice *d, gint64 timeout_us)
{
- QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev);
gint64 start_time =3D g_get_monotonic_time();
=20
- do {
+ while (!get_config_isr_status(d)) {
g_assert(g_get_monotonic_time() - start_time <=3D timeout_us);
- qtest_clock_step(dev->pdev->bus->qts, 100);
- } while (!get_config_isr_status(d));
+ }
}
=20
static void queue_select(QVirtioDevice *d, uint16_t index)
diff --git a/tests/qtest/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pc=
i.c
index 485b8f6b7e..002bf8b8c2 100644
--- a/tests/qtest/libqos/virtio-pci.c
+++ b/tests/qtest/libqos/virtio-pci.c
@@ -171,13 +171,11 @@ static bool qvirtio_pci_get_config_isr_status(QVirtio=
Device *d)
static void qvirtio_pci_wait_config_isr_status(QVirtioDevice *d,
gint64 timeout_us)
{
- QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev);
gint64 start_time =3D g_get_monotonic_time();
=20
- do {
+ while (!qvirtio_pci_get_config_isr_status(d)) {
g_assert(g_get_monotonic_time() - start_time <=3D timeout_us);
- qtest_clock_step(dev->pdev->bus->qts, 100);
- } while (!qvirtio_pci_get_config_isr_status(d));
+ }
}
=20
static void qvirtio_pci_queue_select(QVirtioDevice *d, uint16_t index)
--=20
2.39.5