From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
qemu-block@nongnu.org, Amit Shah <amit@kernel.org>,
John Snow <jsnow@redhat.com>, Jason Wang <jasowang@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Markus Armbruster <armbru@redhat.com>, Greg Kurz <groug@kaod.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 2/6] tests/libqos: Make virtio-pci code independent from global_qtest
Date: Tue, 13 Aug 2019 11:30:43 +0200 [thread overview]
Message-ID: <20190813093047.27948-3-thuth@redhat.com> (raw)
In-Reply-To: <20190813093047.27948-1-thuth@redhat.com>
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 <thuth@redhat.com>
---
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(QVirtioDevice *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 = readl(vqpci->msix_addr);
+ data = qtest_readl(dev->pdev->bus->qts, vqpci->msix_addr);
if (data == 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(QVirtioDevice *d)
/* No ISR checking should be done if masked, but read anyway */
return qpci_msix_pending(dev->pdev, dev->config_msix_entry);
} else {
- data = readl(dev->config_msix_addr);
+ data = qtest_readl(dev->pdev->bus->qts, dev->config_msix_addr);
if (data == 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;
--
2.18.1
next prev parent reply other threads:[~2019-08-13 9:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 9:30 [Qemu-devel] [PATCH 0/6] First batch of global_qtest-removement patches for QEMU 4.2 Thomas Huth
2019-08-13 9:30 ` [Qemu-devel] [PATCH 1/6] tests/libqos: Make generic virtio code independent from global_qtest Thomas Huth
2019-08-13 15:18 ` Eric Blake
2019-08-14 19:59 ` [Qemu-devel] [PATCH v2] " Thomas Huth
2019-08-13 9:30 ` Thomas Huth [this message]
2019-08-13 15:19 ` [Qemu-devel] [PATCH 2/6] tests/libqos: Make virtio-pci " Eric Blake
2019-08-13 9:30 ` [Qemu-devel] [PATCH 3/6] tests/libqtest: Remove unused function hmp() Thomas Huth
2019-08-13 15:20 ` Eric Blake
2019-08-13 17:38 ` Thomas Huth
2019-08-13 9:30 ` [Qemu-devel] [PATCH 4/6] tests/libqtest: Clean up qtest_cb_for_every_machine() wrt global_qtest Thomas Huth
2019-08-13 15:21 ` Eric Blake
2019-08-13 9:30 ` [Qemu-devel] [PATCH 5/6] tests/libqtest: Make qtest_qmp_device_add/del independent from global_qtest Thomas Huth
2019-08-13 15:22 ` Eric Blake
2019-08-13 9:30 ` [Qemu-devel] [PATCH 6/6] tests/libqtest: Make qmp_assert_success() " Thomas Huth
2019-08-13 15:24 ` Eric Blake
2019-08-13 15:00 ` [Qemu-devel] [PATCH 0/6] First batch of global_qtest-removement patches for QEMU 4.2 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813093047.27948-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=amit@kernel.org \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=fam@euphon.net \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).