From nobody Fri Apr 26 21:06:57 2024 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=1565688834; cv=none; d=zoho.com; s=zohoarc; b=cTWok8hhXVAVuNVFyqzDJVXxw6UhUC6mLZEWkY6dzk4WNiiagR52Q++Bp0ty4tyXSITnhlx2zJMFZ5kfc1BBpDQOWlpeypZv+TflYdNyJQ6V9V7OrzNOb3GwA25HiEgUcV1Usf/nwvrDQMeAwX+Tb5WzajVLywbzrF2Vn8j8MtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688834; 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=dgNiVLXo6eGogJgDgAkQn1cuhiv8sT1ZGfarx/Z/PFE=; b=WcIkXOcZdsFW2dhRXxzkH4erl50AD+6OZXf231IeukwZdZDvphNfPGXbIVmmP8/pZ6gCa8SDZhkE5ZNW9pbMVdNYEn/K+0w2QIw4Ve5u+ueBa7ju964n0L2ThViAFlvrqQLUaT3DCED8rL4IjGXbdlZsaYqWBPwkjn/Q6Ta4jUI= 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 1565688834434199.15127478627278; Tue, 13 Aug 2019 02:33:54 -0700 (PDT) Received: from localhost ([::1]:50602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTBh-0001xi-8y for importer@patchew.org; Tue, 13 Aug 2019 05:33:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53436) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9D-0006Uk-AW for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT99-00059o-L7 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37536) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT91-00056Y-TF; Tue, 13 Aug 2019 05:31:08 -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 1B6FC308218D; Tue, 13 Aug 2019 09:31:07 +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 1D6C02AF4D; Tue, 13 Aug 2019 09:31:00 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:42 +0200 Message-Id: <20190813093047.27948-2-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.47]); Tue, 13 Aug 2019 09:31:07 +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 1/6] tests/libqos: Make generic virtio 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. Pass around a pointer to the QTestState instead. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/libqos/virtio.c | 74 ++++++++++--------- tests/libqos/virtio.h | 27 +++---- tests/virtio-9p-test.c | 16 +++-- tests/virtio-blk-test.c | 151 ++++++++++++++++++++------------------- tests/virtio-net-test.c | 33 +++++---- tests/virtio-scsi-test.c | 13 ++-- 6 files changed, 170 insertions(+), 144 deletions(-) diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c index b4c01dc0c1..191e2f97f9 100644 --- a/tests/libqos/virtio.c +++ b/tests/libqos/virtio.c @@ -101,7 +101,7 @@ void qvirtio_wait_queue_isr(QVirtioDevice *d, * The virtqueue interrupt must not be raised, making this useful for test= ing * event_index functionality. */ -uint8_t qvirtio_wait_status_byte_no_isr(QVirtioDevice *d, +uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, uint64_t addr, gint64 timeout_us) @@ -126,7 +126,7 @@ uint8_t qvirtio_wait_status_byte_no_isr(QVirtioDevice *= d, * * This function waits for the next completed request on the used ring. */ -void qvirtio_wait_used_elem(QVirtioDevice *d, +void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, uint32_t desc_idx, uint32_t *len, @@ -140,7 +140,7 @@ void qvirtio_wait_used_elem(QVirtioDevice *d, clock_step(100); =20 if (d->bus->get_queue_isr_status(d, vq) && - qvirtqueue_get_buf(vq, &got_desc_idx, len)) { + qvirtqueue_get_buf(qts, vq, &got_desc_idx, len)) { g_assert_cmpint(got_desc_idx, =3D=3D, desc_idx); return; } @@ -193,7 +193,7 @@ void qvring_init(QTestState *qts, const QGuestAllocator= *alloc, QVirtQueue *vq, 0); } =20 -QVRingIndirectDesc *qvring_indirect_desc_setup(QVirtioDevice *d, +QVRingIndirectDesc *qvring_indirect_desc_setup(QTestState *qs, QVirtioDevi= ce *d, QGuestAllocator *alloc, uint16_t e= lem) { int i; @@ -205,41 +205,41 @@ QVRingIndirectDesc *qvring_indirect_desc_setup(QVirti= oDevice *d, =20 for (i =3D 0; i < elem - 1; ++i) { /* indirect->desc[i].addr */ - writeq(indirect->desc + (16 * i), 0); + qtest_writeq(qs, indirect->desc + (16 * i), 0); /* indirect->desc[i].flags */ - writew(indirect->desc + (16 * i) + 12, VRING_DESC_F_NEXT); + qtest_writew(qs, indirect->desc + (16 * i) + 12, VRING_DESC_F_NEXT= ); /* indirect->desc[i].next */ - writew(indirect->desc + (16 * i) + 14, i + 1); + qtest_writew(qs, indirect->desc + (16 * i) + 14, i + 1); } =20 return indirect; } =20 -void qvring_indirect_desc_add(QVRingIndirectDesc *indirect, uint64_t data, - uint32_t len, bool wri= te) +void qvring_indirect_desc_add(QTestState *qts, QVRingIndirectDesc *indirec= t, + uint64_t data, uint32_t len, bool write) { uint16_t flags; =20 g_assert_cmpint(indirect->index, <, indirect->elem); =20 - flags =3D readw(indirect->desc + (16 * indirect->index) + 12); + flags =3D qtest_readw(qts, indirect->desc + (16 * indirect->index) + 1= 2); =20 if (write) { flags |=3D VRING_DESC_F_WRITE; } =20 /* indirect->desc[indirect->index].addr */ - writeq(indirect->desc + (16 * indirect->index), data); + qtest_writeq(qts, indirect->desc + (16 * indirect->index), data); /* indirect->desc[indirect->index].len */ - writel(indirect->desc + (16 * indirect->index) + 8, len); + qtest_writel(qts, indirect->desc + (16 * indirect->index) + 8, len); /* indirect->desc[indirect->index].flags */ - writew(indirect->desc + (16 * indirect->index) + 12, flags); + qtest_writew(qts, indirect->desc + (16 * indirect->index) + 12, flags); =20 indirect->index++; } =20 -uint32_t qvirtqueue_add(QVirtQueue *vq, uint64_t data, uint32_t len, bool = write, - bool n= ext) +uint32_t qvirtqueue_add(QTestState *qts, QVirtQueue *vq, uint64_t data, + uint32_t len, bool write, bool next) { uint16_t flags =3D 0; vq->num_free--; @@ -253,16 +253,17 @@ uint32_t qvirtqueue_add(QVirtQueue *vq, uint64_t data= , uint32_t len, bool write, } =20 /* vq->desc[vq->free_head].addr */ - writeq(vq->desc + (16 * vq->free_head), data); + qtest_writeq(qts, vq->desc + (16 * vq->free_head), data); /* vq->desc[vq->free_head].len */ - writel(vq->desc + (16 * vq->free_head) + 8, len); + qtest_writel(qts, vq->desc + (16 * vq->free_head) + 8, len); /* vq->desc[vq->free_head].flags */ - writew(vq->desc + (16 * vq->free_head) + 12, flags); + qtest_writew(qts, vq->desc + (16 * vq->free_head) + 12, flags); =20 return vq->free_head++; /* Return and increase, in this order */ } =20 -uint32_t qvirtqueue_add_indirect(QVirtQueue *vq, QVRingIndirectDesc *indir= ect) +uint32_t qvirtqueue_add_indirect(QTestState *qts, QVirtQueue *vq, + QVRingIndirectDesc *indirect) { g_assert(vq->indirect); g_assert_cmpint(vq->size, >=3D, indirect->elem); @@ -271,33 +272,35 @@ uint32_t qvirtqueue_add_indirect(QVirtQueue *vq, QVRi= ngIndirectDesc *indirect) vq->num_free--; =20 /* vq->desc[vq->free_head].addr */ - writeq(vq->desc + (16 * vq->free_head), indirect->desc); + qtest_writeq(qts, vq->desc + (16 * vq->free_head), indirect->desc); /* vq->desc[vq->free_head].len */ - writel(vq->desc + (16 * vq->free_head) + 8, + qtest_writel(qts, vq->desc + (16 * vq->free_head) + 8, sizeof(struct vring_desc) * indirect->elem); /* vq->desc[vq->free_head].flags */ - writew(vq->desc + (16 * vq->free_head) + 12, VRING_DESC_F_INDIRECT); + qtest_writew(qts, vq->desc + (16 * vq->free_head) + 12, + VRING_DESC_F_INDIRECT); =20 return vq->free_head++; /* Return and increase, in this order */ } =20 -void qvirtqueue_kick(QVirtioDevice *d, QVirtQueue *vq, uint32_t free_head) +void qvirtqueue_kick(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, + uint32_t free_head) { /* vq->avail->idx */ - uint16_t idx =3D readw(vq->avail + 2); + uint16_t idx =3D qtest_readw(qts, vq->avail + 2); /* vq->used->flags */ uint16_t flags; /* vq->used->avail_event */ uint16_t avail_event; =20 /* vq->avail->ring[idx % vq->size] */ - writew(vq->avail + 4 + (2 * (idx % vq->size)), free_head); + qtest_writew(qts, vq->avail + 4 + (2 * (idx % vq->size)), free_head); /* vq->avail->idx */ - writew(vq->avail + 2, idx + 1); + qtest_writew(qts, vq->avail + 2, idx + 1); =20 /* Must read after idx is updated */ - flags =3D readw(vq->avail); - avail_event =3D readw(vq->used + 4 + + flags =3D qtest_readw(qts, vq->avail); + avail_event =3D qtest_readw(qts, vq->used + 4 + sizeof(struct vring_used_elem) * vq->size); =20 /* < 1 because we add elements to avail queue one by one */ @@ -317,12 +320,13 @@ void qvirtqueue_kick(QVirtioDevice *d, QVirtQueue *vq= , uint32_t free_head) * * Returns: true if an element was ready, false otherwise */ -bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_idx, uint32_t *len) +bool qvirtqueue_get_buf(QTestState *qts, QVirtQueue *vq, uint32_t *desc_id= x, + uint32_t *len) { uint16_t idx; uint64_t elem_addr; =20 - idx =3D readw(vq->used + offsetof(struct vring_used, idx)); + idx =3D qtest_readw(qts, vq->used + offsetof(struct vring_used, idx)); if (idx =3D=3D vq->last_used_idx) { return false; } @@ -333,23 +337,25 @@ bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *des= c_idx, uint32_t *len) sizeof(struct vring_used_elem); =20 if (desc_idx) { - *desc_idx =3D readl(elem_addr + offsetof(struct vring_used_elem, i= d)); + *desc_idx =3D qtest_readl(qts, elem_addr + + offsetof(struct vring_used_elem, id)); } =20 if (len) { - *len =3D readw(elem_addr + offsetof(struct vring_used_elem, len)); + *len =3D qtest_readw(qts, elem_addr + + offsetof(struct vring_used_elem, len)); } =20 vq->last_used_idx++; return true; } =20 -void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx) +void qvirtqueue_set_used_event(QTestState *qts, QVirtQueue *vq, uint16_t i= dx) { g_assert(vq->event); =20 /* vq->avail->used_event */ - writew(vq->avail + 4 + (2 * vq->size), idx); + qtest_writew(qts, vq->avail + 4 + (2 * vq->size), idx); } =20 void qvirtio_start_device(QVirtioDevice *vdev) diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index 7b97f5e567..b6e21110b8 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -114,11 +114,11 @@ void qvirtio_set_driver_ok(QVirtioDevice *d); =20 void qvirtio_wait_queue_isr(QVirtioDevice *d, QVirtQueue *vq, gint64 timeout_us); -uint8_t qvirtio_wait_status_byte_no_isr(QVirtioDevice *d, +uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, uint64_t addr, gint64 timeout_us); -void qvirtio_wait_used_elem(QVirtioDevice *d, +void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, uint32_t desc_idx, uint32_t *len, @@ -131,17 +131,20 @@ void qvirtqueue_cleanup(const QVirtioBus *bus, QVirtQ= ueue *vq, =20 void qvring_init(QTestState *qts, const QGuestAllocator *alloc, QVirtQueue= *vq, uint64_t addr); -QVRingIndirectDesc *qvring_indirect_desc_setup(QVirtioDevice *d, +QVRingIndirectDesc *qvring_indirect_desc_setup(QTestState *qs, QVirtioDevi= ce *d, QGuestAllocator *alloc, uint16_t e= lem); -void qvring_indirect_desc_add(QVRingIndirectDesc *indirect, uint64_t data, - uint32_t len, bool wri= te); -uint32_t qvirtqueue_add(QVirtQueue *vq, uint64_t data, uint32_t len, bool = write, - bool n= ext); -uint32_t qvirtqueue_add_indirect(QVirtQueue *vq, QVRingIndirectDesc *indir= ect); -void qvirtqueue_kick(QVirtioDevice *d, QVirtQueue *vq, uint32_t free_head); -bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_idx, uint32_t *len); - -void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx); +void qvring_indirect_desc_add(QTestState *qts, QVRingIndirectDesc *indirec= t, + uint64_t data, uint32_t len, bool write); +uint32_t qvirtqueue_add(QTestState *qts, QVirtQueue *vq, uint64_t data, + uint32_t len, bool write, bool next); +uint32_t qvirtqueue_add_indirect(QTestState *qts, QVirtQueue *vq, + QVRingIndirectDesc *indirect); +void qvirtqueue_kick(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq, + uint32_t free_head); +bool qvirtqueue_get_buf(QTestState *qts, QVirtQueue *vq, uint32_t *desc_id= x, + uint32_t *len); + +void qvirtqueue_set_used_event(QTestState *qts, QVirtQueue *vq, uint16_t i= dx); =20 void qvirtio_start_device(QVirtioDevice *vdev); =20 diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index ac49bca991..30e6cf3e63 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -39,6 +39,7 @@ static void pci_config(void *obj, void *data, QGuestAlloc= ator *t_alloc) #define P9_MAX_SIZE 4096 /* Max size of a T-message or R-message */ =20 typedef struct { + QTestState *qts; QVirtio9P *v9p; uint16_t tag; uint64_t t_msg; @@ -52,7 +53,7 @@ typedef struct { =20 static void v9fs_memwrite(P9Req *req, const void *addr, size_t len) { - memwrite(req->t_msg + req->t_off, addr, len); + qtest_memwrite(req->qts, req->t_msg + req->t_off, addr, len); req->t_off +=3D len; } =20 @@ -63,7 +64,7 @@ static void v9fs_memskip(P9Req *req, size_t len) =20 static void v9fs_memread(P9Req *req, void *addr, size_t len) { - memread(req->r_msg + req->r_off, addr, len); + qtest_memread(req->qts, req->r_msg + req->r_off, addr, len); req->r_off +=3D len; } =20 @@ -158,6 +159,7 @@ static P9Req *v9fs_req_init(QVirtio9P *v9p, uint32_t si= ze, uint8_t id, =20 g_assert_cmpint(total_size, <=3D, P9_MAX_SIZE); =20 + req->qts =3D global_qtest; req->v9p =3D v9p; req->t_size =3D total_size; req->t_msg =3D guest_alloc(alloc, req->t_size); @@ -171,10 +173,10 @@ static void v9fs_req_send(P9Req *req) QVirtio9P *v9p =3D req->v9p; =20 req->r_msg =3D guest_alloc(alloc, P9_MAX_SIZE); - req->free_head =3D qvirtqueue_add(v9p->vq, req->t_msg, req->t_size, fa= lse, - true); - qvirtqueue_add(v9p->vq, req->r_msg, P9_MAX_SIZE, true, false); - qvirtqueue_kick(v9p->vdev, v9p->vq, req->free_head); + req->free_head =3D qvirtqueue_add(req->qts, v9p->vq, req->t_msg, req->= t_size, + false, true); + qvirtqueue_add(req->qts, v9p->vq, req->r_msg, P9_MAX_SIZE, true, false= ); + qvirtqueue_kick(req->qts, v9p->vdev, v9p->vq, req->free_head); req->t_off =3D 0; } =20 @@ -195,7 +197,7 @@ static void v9fs_req_wait_for_reply(P9Req *req, uint32_= t *len) { QVirtio9P *v9p =3D req->v9p; =20 - qvirtio_wait_used_elem(v9p->vdev, v9p->vq, req->free_head, len, + qvirtio_wait_used_elem(req->qts, v9p->vdev, v9p->vq, req->free_head, l= en, QVIRTIO_9P_TIMEOUT_US); } =20 diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 1b02714bc7..ff365c8035 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -123,6 +123,7 @@ static void test_basic(QVirtioDevice *dev, QGuestAlloca= tor *alloc, uint32_t free_head; uint8_t status; char *data; + QTestState *qts =3D global_qtest; =20 capacity =3D qvirtio_config_readq(dev, 0); =20 @@ -149,13 +150,14 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, false, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_U= S); + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -171,13 +173,14 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, true, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_U= S); + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -206,13 +209,14 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 req_addr =3D virtio_blk_request(alloc, dev, &req, sizeof(dwz_hdr)); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, sizeof(dwz_hdr), false, true); - qvirtqueue_add(vq, req_addr + 16 + sizeof(dwz_hdr), 1, true, false= ); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, sizeof(dwz_hdr), false, tru= e); + qvirtqueue_add(qts, vq, req_addr + 16 + sizeof(dwz_hdr), 1, true, + false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 16 + sizeof(dwz_hdr)); g_assert_cmpint(status, =3D=3D, 0); @@ -229,13 +233,13 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, true, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -263,13 +267,13 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 req_addr =3D virtio_blk_request(alloc, dev, &req, sizeof(dwz_hdr)); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, sizeof(dwz_hdr), false, true); - qvirtqueue_add(vq, req_addr + 16 + sizeof(dwz_hdr), 1, true, false= ); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, sizeof(dwz_hdr), false, tru= e); + qvirtqueue_add(qts, vq, req_addr + 16 + sizeof(dwz_hdr), 1, true, = false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 16 + sizeof(dwz_hdr)); g_assert_cmpint(status, =3D=3D, 0); @@ -290,11 +294,11 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 528, false, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 528, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -311,12 +315,12 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 513, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 513, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -353,6 +357,7 @@ static void indirect(void *obj, void *u_data, QGuestAll= ocator *t_alloc) uint32_t free_head; uint8_t status; char *data; + QTestState *qts =3D global_qtest; =20 capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); @@ -378,13 +383,13 @@ static void indirect(void *obj, void *u_data, QGuestA= llocator *t_alloc) =20 g_free(req.data); =20 - indirect =3D qvring_indirect_desc_setup(dev, t_alloc, 2); - qvring_indirect_desc_add(indirect, req_addr, 528, false); - qvring_indirect_desc_add(indirect, req_addr + 528, 1, true); - free_head =3D qvirtqueue_add_indirect(vq, indirect); - qvirtqueue_kick(dev, vq, free_head); + indirect =3D qvring_indirect_desc_setup(qts, dev, t_alloc, 2); + qvring_indirect_desc_add(qts, indirect, req_addr, 528, false); + qvring_indirect_desc_add(qts, indirect, req_addr + 528, 1, true); + free_head =3D qvirtqueue_add_indirect(qts, vq, indirect); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -403,13 +408,13 @@ static void indirect(void *obj, void *u_data, QGuestA= llocator *t_alloc) =20 g_free(req.data); =20 - indirect =3D qvring_indirect_desc_setup(dev, t_alloc, 2); - qvring_indirect_desc_add(indirect, req_addr, 16, false); - qvring_indirect_desc_add(indirect, req_addr + 16, 513, true); - free_head =3D qvirtqueue_add_indirect(vq, indirect); - qvirtqueue_kick(dev, vq, free_head); + indirect =3D qvring_indirect_desc_setup(qts, dev, t_alloc, 2); + qvring_indirect_desc_add(qts, indirect, req_addr, 16, false); + qvring_indirect_desc_add(qts, indirect, req_addr + 16, 513, true); + free_head =3D qvirtqueue_add_indirect(qts, vq, indirect); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -461,6 +466,7 @@ static void msix(void *obj, void *u_data, QGuestAllocat= or *t_alloc) char *data; QOSGraphObject *blk_object =3D obj; QPCIDevice *pci_dev =3D blk_object->get_driver(blk_object, "pci-device= "); + QTestState *qts =3D global_qtest; =20 if (qpci_check_buggy_msi(pci_dev)) { return; @@ -504,12 +510,12 @@ static void msix(void *obj, void *u_data, QGuestAlloc= ator *t_alloc) =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, false, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); @@ -527,14 +533,14 @@ static void msix(void *obj, void *u_data, QGuestAlloc= ator *t_alloc) =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, true, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); @@ -569,6 +575,7 @@ static void idx(void *obj, void *u_data, QGuestAllocato= r *t_alloc) char *data; QOSGraphObject *blk_object =3D obj; QPCIDevice *pci_dev =3D blk_object->get_driver(blk_object, "pci-device= "); + QTestState *qts =3D global_qtest; =20 if (qpci_check_buggy_msi(pci_dev)) { return; @@ -603,12 +610,12 @@ static void idx(void *obj, void *u_data, QGuestAlloca= tor *t_alloc) =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, false, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 /* Write request */ @@ -623,15 +630,15 @@ static void idx(void *obj, void *u_data, QGuestAlloca= tor *t_alloc) g_free(req.data); =20 /* Notify after processing the third request */ - qvirtqueue_set_used_event(vq, 2); - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, false, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_set_used_event(qts, vq, 2); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); write_head =3D free_head; =20 /* No notification expected */ - status =3D qvirtio_wait_status_byte_no_isr(dev, + status =3D qvirtio_wait_status_byte_no_isr(qts, dev, vq, req_addr + 528, QVIRTIO_BLK_TIMEOUT_US); g_assert_cmpint(status, =3D=3D, 0); @@ -648,16 +655,16 @@ static void idx(void *obj, void *u_data, QGuestAlloca= tor *t_alloc) =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); - qvirtqueue_add(vq, req_addr + 16, 512, true, true); - qvirtqueue_add(vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 16, false, true); + qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true); + qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(dev, vq, free_head); + qvirtqueue_kick(qts, dev, vq, free_head); =20 /* We get just one notification for both requests */ - qvirtio_wait_used_elem(dev, vq, write_head, NULL, + qvirtio_wait_used_elem(qts, dev, vq, write_head, NULL, QVIRTIO_BLK_TIMEOUT_US); - g_assert(qvirtqueue_get_buf(vq, &desc_idx, NULL)); + g_assert(qvirtqueue_get_buf(qts, vq, &desc_idx, NULL)); g_assert_cmpint(desc_idx, =3D=3D, free_head); =20 status =3D readb(req_addr + 528); diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 7aa9622f30..1071dd82c9 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -33,6 +33,7 @@ static void rx_test(QVirtioDevice *dev, QGuestAllocator *alloc, QVirtQueue *vq, int socket) { + QTestState *qts =3D global_qtest; uint64_t req_addr; uint32_t free_head; char test[] =3D "TEST"; @@ -51,13 +52,14 @@ static void rx_test(QVirtioDevice *dev, =20 req_addr =3D guest_alloc(alloc, 64); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 64, true, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 64, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 ret =3D iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); g_assert_cmpint(ret, =3D=3D, sizeof(test) + sizeof(len)); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_NET_TIMEOUT_U= S); + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_NET_TIMEOUT_US); memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); g_assert_cmpstr(buffer, =3D=3D, "TEST"); =20 @@ -68,6 +70,7 @@ static void tx_test(QVirtioDevice *dev, QGuestAllocator *alloc, QVirtQueue *vq, int socket) { + QTestState *qts =3D global_qtest; uint64_t req_addr; uint32_t free_head; uint32_t len; @@ -77,10 +80,11 @@ static void tx_test(QVirtioDevice *dev, req_addr =3D guest_alloc(alloc, 64); memwrite(req_addr + VNET_HDR_SIZE, "TEST", 4); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 64, false, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 64, false, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_NET_TIMEOUT_U= S); + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_NET_TIMEOUT_US); guest_free(alloc, req_addr); =20 ret =3D qemu_recv(socket, &len, sizeof(len), 0); @@ -95,6 +99,7 @@ static void rx_stop_cont_test(QVirtioDevice *dev, QGuestAllocator *alloc, QVirtQueue *vq, int socket) { + QTestState *qts =3D global_qtest; uint64_t req_addr; uint32_t free_head; char test[] =3D "TEST"; @@ -114,8 +119,8 @@ static void rx_stop_cont_test(QVirtioDevice *dev, =20 req_addr =3D guest_alloc(alloc, 64); =20 - free_head =3D qvirtqueue_add(vq, req_addr, 64, true, false); - qvirtqueue_kick(dev, vq, free_head); + free_head =3D qvirtqueue_add(qts, vq, req_addr, 64, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); =20 rsp =3D qmp("{ 'execute' : 'stop'}"); qobject_unref(rsp); @@ -131,7 +136,8 @@ static void rx_stop_cont_test(QVirtioDevice *dev, rsp =3D qmp("{ 'execute' : 'cont'}"); qobject_unref(rsp); =20 - qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_NET_TIMEOUT_U= S); + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, + QVIRTIO_NET_TIMEOUT_US); memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); g_assert_cmpstr(buffer, =3D=3D, "TEST"); =20 @@ -283,19 +289,20 @@ static void large_tx(void *obj, void *data, QGuestAll= ocator *t_alloc) uint64_t req_addr; uint32_t free_head; size_t alloc_size =3D (size_t)data / 64; + QTestState *qts =3D global_qtest; int i; =20 /* Bypass the limitation by pointing several descriptors to a single * smaller area */ req_addr =3D guest_alloc(t_alloc, alloc_size); - free_head =3D qvirtqueue_add(vq, req_addr, alloc_size, false, true); + free_head =3D qvirtqueue_add(qts, vq, req_addr, alloc_size, false, tru= e); =20 for (i =3D 0; i < 64; i++) { - qvirtqueue_add(vq, req_addr, alloc_size, false, i !=3D 63); + qvirtqueue_add(qts, vq, req_addr, alloc_size, false, i !=3D 63); } - qvirtqueue_kick(dev->vdev, vq, free_head); + qvirtqueue_kick(qts, dev->vdev, vq, free_head); =20 - qvirtio_wait_used_elem(dev->vdev, vq, free_head, NULL, + qvirtio_wait_used_elem(qts, dev->vdev, vq, free_head, NULL, QVIRTIO_NET_TIMEOUT_US); guest_free(t_alloc, req_addr); } diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 1ad9f75d74..6f8b310cf8 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -72,6 +72,7 @@ static uint8_t virtio_scsi_do_command(QVirtioSCSIQueues *= vs, uint64_t req_addr, resp_addr, data_in_addr =3D 0, data_out_addr =3D 0; uint8_t response; uint32_t free_head; + QTestState *qts =3D global_qtest; =20 vq =3D vs->vq[2]; =20 @@ -83,24 +84,24 @@ static uint8_t virtio_scsi_do_command(QVirtioSCSIQueues= *vs, =20 /* Add request header */ req_addr =3D qvirtio_scsi_alloc(vs, sizeof(req), &req); - free_head =3D qvirtqueue_add(vq, req_addr, sizeof(req), false, true); + free_head =3D qvirtqueue_add(qts, vq, req_addr, sizeof(req), false, tr= ue); =20 if (data_out_len) { data_out_addr =3D qvirtio_scsi_alloc(vs, data_out_len, data_out); - qvirtqueue_add(vq, data_out_addr, data_out_len, false, true); + qvirtqueue_add(qts, vq, data_out_addr, data_out_len, false, true); } =20 /* Add response header */ resp_addr =3D qvirtio_scsi_alloc(vs, sizeof(resp), &resp); - qvirtqueue_add(vq, resp_addr, sizeof(resp), true, !!data_in_len); + qvirtqueue_add(qts, vq, resp_addr, sizeof(resp), true, !!data_in_len); =20 if (data_in_len) { data_in_addr =3D qvirtio_scsi_alloc(vs, data_in_len, data_in); - qvirtqueue_add(vq, data_in_addr, data_in_len, true, false); + qvirtqueue_add(qts, vq, data_in_addr, data_in_len, true, false); } =20 - qvirtqueue_kick(vs->dev, vq, free_head); - qvirtio_wait_used_elem(vs->dev, vq, free_head, NULL, + qvirtqueue_kick(qts, vs->dev, vq, free_head); + qvirtio_wait_used_elem(qts, vs->dev, vq, free_head, NULL, QVIRTIO_SCSI_TIMEOUT_US); =20 response =3D readb(resp_addr + --=20 2.18.1 From nobody Fri Apr 26 21:06:57 2024 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 Reviewed-by: Stefan Hajnoczi --- 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 From nobody Fri Apr 26 21:06:57 2024 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=1565688765; cv=none; d=zoho.com; s=zohoarc; b=WJS4XYsllnWgTGKU3OYxjAAntOGmw8CWfpUtNgOGZWNgJH9tNnqNMod6zpGksxRw+ouosNgWl9Lj9wgYqJJYeOweRis+MGtwS4EzuvgGt9qlbx80nYecmmAP9v/LviH4jPs1utbYhyK8EwZkf7wT6WSm6NOc3a+yavPIo5e6tyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688765; 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=RebD94j2T3G1PTx83p+5a/fbBPDwU+iM+J6XChqi6e0=; b=eKEoIedtgg58bEHdYVjejk70lVWph9NUhNvrHvuNBbRoRTCkwtsDS9RT0GUzzcP0WY+t3tEdbervP3sBrPRqXJfEjvqjfs7qG3Z7qe/NcipfC3VxRctoIhBsyb1rjbVbBVjbq9fF24eM22syDRNZDYv4BKmWfagx3zQ3dbQ8UWw= 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 156568876518021.793879553586294; Tue, 13 Aug 2019 02:32:45 -0700 (PDT) Received: from localhost ([::1]:50572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTAa-0008UE-2N for importer@patchew.org; Tue, 13 Aug 2019 05:32:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53513) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9O-0006kJ-59 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT9M-0005Ha-3N for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT9I-0005Di-Ln; Tue, 13 Aug 2019 05:31:24 -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 DC420316D76D; Tue, 13 Aug 2019 09:31:23 +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 0B3BB2AF4D; Tue, 13 Aug 2019 09:31:10 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:44 +0200 Message-Id: <20190813093047.27948-4-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.41]); Tue, 13 Aug 2019 09:31: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 3/6] tests/libqtest: Remove unused function hmp() 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" No test is using hmp() anymore, and since this function uses the disliked global_qtest variable, we should also make sure that nobody adds new code with this function again. qtest_hmp() should be used instead. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/libqtest.c | 11 ----------- tests/libqtest.h | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 3c5c3f49d8..3e9245d4c9 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -1130,17 +1130,6 @@ void qmp_assert_success(const char *fmt, ...) qobject_unref(response); } =20 -char *hmp(const char *fmt, ...) -{ - va_list ap; - char *ret; - - va_start(ap, fmt); - ret =3D qtest_vhmp(global_qtest, fmt, ap); - va_end(ap); - return ret; -} - bool qtest_big_endian(QTestState *s) { return s->big_endian; diff --git a/tests/libqtest.h b/tests/libqtest.h index cadf1d4a03..0009b65791 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -687,16 +687,6 @@ static inline void qmp_eventwait(const char *event) return qtest_qmp_eventwait(global_qtest, event); } =20 -/** - * hmp: - * @fmt...: HMP command to send to QEMU, formats arguments like sprintf(). - * - * Send HMP command to QEMU via QMP's human-monitor-command. - * - * Returns: the command's output. The caller should g_free() it. - */ -char *hmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2); - /** * get_irq: * @num: Interrupt to observe. --=20 2.18.1 From nobody Fri Apr 26 21:06:57 2024 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=1565688915; cv=none; d=zoho.com; s=zohoarc; b=eIkjKt9kvTOCzEU5/0gNnJxB+TEq8CuDF/yjPxsRAswA9AHAcXev9VQ36aedVNbrPEwkm4nhPRdxsMg8KZydW/eM7drYxCrU5E80IVsEWnAPrTslbCTle8a3lkDMGRufFgBrRUeoi3unK5w526hUw2ZYWw/NLiCj+vsC4zxsHAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688915; 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=PcANkg99qBnghawLnkjnKUmdHd+KS+ivUNCzPWINgtw=; b=X4cv7nSSpNxJBBpZw0M40DH/jKLMEN6xoeAXOstAP9oy1zk3PVkZ+rKB+an+1ur9SrCgX5XCx1qdX51PoT3U3+KttlW7jpCu1JBlUSU/t2SgNlILYdG9YSp+VRfw81OW8OaG+IH8iV0Vp1AlQYyvdZl2IqoXQSiqirKqRJJkjT4= 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 1565688915399414.80212450037664; Tue, 13 Aug 2019 02:35:15 -0700 (PDT) Received: from localhost ([::1]:50626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTD0-0004bz-Ep for importer@patchew.org; Tue, 13 Aug 2019 05:35:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53551) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9R-0006lv-3u for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT9Q-0005Lp-8a for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT9M-0005HN-3x; Tue, 13 Aug 2019 05:31:28 -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 61F9C308218D; Tue, 13 Aug 2019 09:31:27 +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 3A711891A1; Tue, 13 Aug 2019 09:31:24 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:45 +0200 Message-Id: <20190813093047.27948-5-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.47]); Tue, 13 Aug 2019 09:31:27 +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 4/6] tests/libqtest: Clean up qtest_cb_for_every_machine() wrt 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 generic libqtest library functions should not use functions that require the global_qtest variable. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/libqtest.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 3e9245d4c9..d1aead30ed 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -1189,9 +1189,10 @@ void qtest_cb_for_every_machine(void (*cb)(const cha= r *machine), QObject *qobj; QString *qstr; const char *mname; + QTestState *qts; =20 - qtest_start("-machine none"); - response =3D qmp("{ 'execute': 'query-machines' }"); + qts =3D qtest_init("-machine none"); + response =3D qtest_qmp(qts, "{ 'execute': 'query-machines' }"); g_assert(response); list =3D qdict_get_qlist(response, "return"); g_assert(list); @@ -1209,7 +1210,7 @@ void qtest_cb_for_every_machine(void (*cb)(const char= *machine), } } =20 - qtest_end(); + qtest_quit(qts); qobject_unref(response); } =20 --=20 2.18.1 From nobody Fri Apr 26 21:06:57 2024 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=1565688888; cv=none; d=zoho.com; s=zohoarc; b=k5gkHP+I1YpcVtnVfAdkaUGtckEOmfOPNvA6gfY2CPE3dUQ2jTOdwPd491ZK6cmGbiunp5b4jQZ8NDcS3LAoFhI4z5z/24Tp8iWVtPzt9xcbew5neyMup78jV92HzFVps88MFDW5lecH8mPxTzz4xyrJdhKxlcDl8LNcXrem9cM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688888; 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=YVDC3TGMs70UBr0Y46RywrxunMZlQPcHQjloSQxZpoA=; b=CaxoKVbzLXsVcsAJk14luOAL/dlkG9ClhwDzUBrgWwPF2eqC0MR2qFYLqQld4PbCdTnevfxkudYWc7rlMyH5zhwn8D243efGg8itAYz8vAI8wPSy18yiConUM97E6A5r+qlPMulU10Pe8k691U5+hRTtRiCNmj8Z3VHrKc353E4= 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 156568888808316.430989481445636; Tue, 13 Aug 2019 02:34:48 -0700 (PDT) Received: from localhost ([::1]:50606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTCV-0003CG-0r for importer@patchew.org; Tue, 13 Aug 2019 05:34:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53597) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9Z-00078D-29 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT9W-0005Ou-W9 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT9S-0005MR-7R; Tue, 13 Aug 2019 05:31:34 -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 3AC3A5AFE3; Tue, 13 Aug 2019 09:31:33 +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 B56F12AF4D; Tue, 13 Aug 2019 09:31:27 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:46 +0200 Message-Id: <20190813093047.27948-6-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.39]); Tue, 13 Aug 2019 09:31:33 +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 5/6] tests/libqtest: Make qtest_qmp_device_add/del 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" Generic library functions like qtest_qmp_device_add() and _del() should not depend on the global_qtest variable. Pass the test state via parameter instead. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/cpu-plug-test.c | 15 +++++++++------ tests/e1000e-test.c | 2 +- tests/ivshmem-test.c | 2 +- tests/libqos/usb.c | 6 +++--- tests/libqos/usb.h | 2 +- tests/libqtest.c | 15 +++++++-------- tests/libqtest.h | 8 +++++--- tests/usb-hcd-ohci-test.c | 2 +- tests/usb-hcd-uhci-test.c | 8 +++++--- tests/usb-hcd-xhci-test.c | 22 +++++++++++++--------- tests/virtio-blk-test.c | 2 +- tests/virtio-ccw-test.c | 18 ++++++++++-------- tests/virtio-net-test.c | 2 +- tests/virtio-rng-test.c | 2 +- tests/virtio-scsi-test.c | 6 ++++-- tests/virtio-serial-test.c | 4 ++-- 16 files changed, 65 insertions(+), 51 deletions(-) diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 668f00144e..3049620854 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -77,18 +77,19 @@ static void test_plug_with_device_add_x86(gconstpointer= data) const PlugTestData *td =3D data; char *args; unsigned int s, c, t; + QTestState *qts; =20 args =3D g_strdup_printf("-machine %s -cpu %s " "-smp 1,sockets=3D%u,cores=3D%u,threads=3D%u,ma= xcpus=3D%u", td->machine, td->cpu_model, td->sockets, td->cores, td->threads, td->maxcpu= s); - qtest_start(args); + qts =3D qtest_init(args); =20 for (s =3D 1; s < td->sockets; s++) { for (c =3D 0; c < td->cores; c++) { for (t =3D 0; t < td->threads; t++) { char *id =3D g_strdup_printf("id-%i-%i-%i", s, c, t); - qtest_qmp_device_add(td->device_model, id, + qtest_qmp_device_add(qts, td->device_model, id, "{'socket-id':%u, 'core-id':%u," " 'thread-id':%u}", s, c, t); @@ -97,7 +98,7 @@ static void test_plug_with_device_add_x86(gconstpointer d= ata) } } =20 - qtest_end(); + qtest_quit(qts); g_free(args); } =20 @@ -106,20 +107,22 @@ static void test_plug_with_device_add_coreid(gconstpo= inter data) const PlugTestData *td =3D data; char *args; unsigned int c; + QTestState *qts; =20 args =3D g_strdup_printf("-machine %s -cpu %s " "-smp 1,sockets=3D%u,cores=3D%u,threads=3D%u,ma= xcpus=3D%u", td->machine, td->cpu_model, td->sockets, td->cores, td->threads, td->maxcpu= s); - qtest_start(args); + qts =3D qtest_init(args); =20 for (c =3D 1; c < td->cores; c++) { char *id =3D g_strdup_printf("id-%i", c); - qtest_qmp_device_add(td->device_model, id, "{'core-id':%u}", c); + qtest_qmp_device_add(qts, td->device_model, id, + "{'core-id':%u}", c); g_free(id); } =20 - qtest_end(); + qtest_quit(qts); g_free(args); } =20 diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c index 445787a7e4..93628c588d 100644 --- a/tests/e1000e-test.c +++ b/tests/e1000e-test.c @@ -235,7 +235,7 @@ static void test_e1000e_hotplug(void *obj, void *data, = QGuestAllocator * alloc) { QTestState *qts =3D global_qtest; /* TODO: get rid of global_qtest he= re */ =20 - qtest_qmp_device_add("e1000e", "e1000e_net", "{'addr': '0x06'}"); + qtest_qmp_device_add(qts, "e1000e", "e1000e_net", "{'addr': '0x06'}"); qpci_unplug_acpi_device_test(qts, "e1000e_net", 0x06); } =20 diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index a467b8c03d..b76457948b 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -389,7 +389,7 @@ static void test_ivshmem_hotplug(void) qts =3D qtest_init("-object memory-backend-ram,size=3D1M,id=3Dmb1"); =20 global_qtest =3D qts; /* TODO: Get rid of global_qtest here */ - qtest_qmp_device_add("ivshmem-plain", "iv1", + qtest_qmp_device_add(qts, "ivshmem-plain", "iv1", "{'addr': %s, 'memdev': 'mb1'}", stringify(PCI_SLOT_HP)); if (strcmp(arch, "ppc64") !=3D 0) { diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c index 49e2f4bc0a..d7a9cb3c72 100644 --- a/tests/libqos/usb.c +++ b/tests/libqos/usb.c @@ -37,20 +37,20 @@ void uhci_port_test(struct qhc *hc, int port, uint16_t = expect) g_assert((value & mask) =3D=3D (expect & mask)); } =20 -void usb_test_hotplug(const char *hcd_id, const char *port, +void usb_test_hotplug(QTestState *qts, const char *hcd_id, const char *por= t, void (*port_check)(void)) { char *id =3D g_strdup_printf("usbdev%s", port); char *bus =3D g_strdup_printf("%s.0", hcd_id); =20 - qtest_qmp_device_add("usb-tablet", id, "{'port': %s, 'bus': %s}", + qtest_qmp_device_add(qts, "usb-tablet", id, "{'port': %s, 'bus': %s}", port, bus); =20 if (port_check) { port_check(); } =20 - qtest_qmp_device_del(id); + qtest_qmp_device_del(qts, id); =20 g_free(bus); g_free(id); diff --git a/tests/libqos/usb.h b/tests/libqos/usb.h index c506418a13..eeced39a2f 100644 --- a/tests/libqos/usb.h +++ b/tests/libqos/usb.h @@ -13,6 +13,6 @@ void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, void uhci_port_test(struct qhc *hc, int port, uint16_t expect); void uhci_deinit(struct qhc *hc); =20 -void usb_test_hotplug(const char *bus_name, const char *port, +void usb_test_hotplug(QTestState *qts, const char *bus_name, const char *p= ort, void (*port_check)(void)); #endif diff --git a/tests/libqtest.c b/tests/libqtest.c index d1aead30ed..19c1fc2e97 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -1246,7 +1246,7 @@ QDict *qtest_qmp_receive_success(QTestState *s, /* * Generic hot-plugging test via the device_add QMP command. */ -void qtest_qmp_device_add(const char *driver, const char *id, +void qtest_qmp_device_add(QTestState *qts, const char *driver, const char = *id, const char *fmt, ...) { QDict *args, *response; @@ -1260,7 +1260,8 @@ void qtest_qmp_device_add(const char *driver, const c= har *id, qdict_put_str(args, "driver", driver); qdict_put_str(args, "id", id); =20 - response =3D qmp("{'execute': 'device_add', 'arguments': %p}", args); + response =3D qtest_qmp(qts, "{'execute': 'device_add', 'arguments': %p= }", + args); g_assert(response); g_assert(!qdict_haskey(response, "event")); /* We don't expect any eve= nts */ g_assert(!qdict_haskey(response, "error")); @@ -1293,19 +1294,17 @@ static void device_deleted_cb(void *opaque, const c= har *name, QDict *data) * * But the order of arrival may vary - so we've got to detect both. */ -void qtest_qmp_device_del(const char *id) +void qtest_qmp_device_del(QTestState *qts, const char *id) { bool got_event =3D false; QDict *rsp; =20 - qtest_qmp_send(global_qtest, - "{'execute': 'device_del', 'arguments': {'id': %s}}", + qtest_qmp_send(qts, "{'execute': 'device_del', 'arguments': {'id': %s}= }", id); - rsp =3D qtest_qmp_receive_success(global_qtest, device_deleted_cb, - &got_event); + rsp =3D qtest_qmp_receive_success(qts, device_deleted_cb, &got_event); qobject_unref(rsp); if (!got_event) { - rsp =3D qtest_qmp_receive(global_qtest); + rsp =3D qtest_qmp_receive(qts); g_assert_cmpstr(qdict_get_try_str(rsp, "event"), =3D=3D, "DEVICE_DELETED"); qobject_unref(rsp); diff --git a/tests/libqtest.h b/tests/libqtest.h index 0009b65791..d93144fb74 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -946,6 +946,7 @@ void qtest_cb_for_every_machine(void (*cb)(const char *= machine), =20 /** * qtest_qmp_device_add: + * @qts: QTestState instance to operate on * @driver: Name of the device that should be added * @id: Identification string * @fmt...: QMP message to send to qemu, formatted like @@ -954,16 +955,17 @@ void qtest_cb_for_every_machine(void (*cb)(const char= *machine), * * Generic hot-plugging test via the device_add QMP command. */ -void qtest_qmp_device_add(const char *driver, const char *id, const char *= fmt, - ...) GCC_FMT_ATTR(3, 4); +void qtest_qmp_device_add(QTestState *qts, const char *driver, const char = *id, + const char *fmt, ...) GCC_FMT_ATTR(4, 5); =20 /** * qtest_qmp_device_del: + * @qts: QTestState instance to operate on * @id: Identification string * * Generic hot-unplugging test via the device_del QMP command. */ -void qtest_qmp_device_del(const char *id); +void qtest_qmp_device_del(QTestState *qts, const char *id); =20 /** * qmp_rsp_is_err: diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c index c12b892085..0cd73b7363 100644 --- a/tests/usb-hcd-ohci-test.c +++ b/tests/usb-hcd-ohci-test.c @@ -23,7 +23,7 @@ struct QOHCI_PCI { =20 static void test_ohci_hotplug(void *obj, void *data, QGuestAllocator *allo= c) { - usb_test_hotplug("ohci", "1", NULL); + usb_test_hotplug(global_qtest, "ohci", "1", NULL); } =20 static void *ohci_pci_get_driver(void *obj, const char *interface) diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c index a119d6d5c8..bdfa006cf5 100644 --- a/tests/usb-hcd-uhci-test.c +++ b/tests/usb-hcd-uhci-test.c @@ -43,14 +43,16 @@ static void test_port_2(void) =20 static void test_uhci_hotplug(void) { - usb_test_hotplug("uhci", "2", test_port_2); + usb_test_hotplug(global_qtest, "uhci", "2", test_port_2); } =20 static void test_usb_storage_hotplug(void) { - qtest_qmp_device_add("usb-storage", "usbdev0", "{'drive': 'drive0'}"); + QTestState *qts =3D global_qtest; =20 - qtest_qmp_device_del("usbdev0"); + qtest_qmp_device_add(qts, "usb-storage", "usbdev0", "{'drive': 'drive0= '}"); + + qtest_qmp_device_del(qts, "usbdev0"); } =20 int main(int argc, char **argv) diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c index 9eb24b00e4..0e51efe59a 100644 --- a/tests/usb-hcd-xhci-test.c +++ b/tests/usb-hcd-xhci-test.c @@ -18,30 +18,34 @@ static void test_xhci_init(void) =20 static void test_xhci_hotplug(void) { - usb_test_hotplug("xhci", "1", NULL); + usb_test_hotplug(global_qtest, "xhci", "1", NULL); } =20 static void test_usb_uas_hotplug(void) { - qtest_qmp_device_add("usb-uas", "uas", "{}"); - qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drive0'}"); + QTestState *qts =3D global_qtest; + + qtest_qmp_device_add(qts, "usb-uas", "uas", "{}"); + qtest_qmp_device_add(qts, "scsi-hd", "scsihd", "{'drive': 'drive0'}"); =20 /* TODO: UAS HBA driver in libqos, to check that added disk is visible after BUS rescan */ =20 - qtest_qmp_device_del("scsihd"); - qtest_qmp_device_del("uas"); + qtest_qmp_device_del(qts, "scsihd"); + qtest_qmp_device_del(qts, "uas"); } =20 static void test_usb_ccid_hotplug(void) { - qtest_qmp_device_add("usb-ccid", "ccid", "{}"); - qtest_qmp_device_del("ccid"); + QTestState *qts =3D global_qtest; + + qtest_qmp_device_add(qts, "usb-ccid", "ccid", "{}"); + qtest_qmp_device_del(qts, "ccid"); /* check the device can be added again */ - qtest_qmp_device_add("usb-ccid", "ccid", "{}"); - qtest_qmp_device_del("ccid"); + qtest_qmp_device_add(qts, "usb-ccid", "ccid", "{}"); + qtest_qmp_device_del(qts, "ccid"); } =20 int main(int argc, char **argv) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index ff365c8035..6a364390db 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -690,7 +690,7 @@ static void pci_hotplug(void *obj, void *data, QGuestAl= locator *t_alloc) QTestState *qts =3D dev1->pdev->bus->qts; =20 /* plug secondary disk */ - qtest_qmp_device_add("virtio-blk-pci", "drv1", + qtest_qmp_device_add(qts, "virtio-blk-pci", "drv1", "{'addr': %s, 'drive': 'drive1'}", stringify(PCI_SLOT_HP) ".0"); =20 diff --git a/tests/virtio-ccw-test.c b/tests/virtio-ccw-test.c index 48c714d84c..83957b265e 100644 --- a/tests/virtio-ccw-test.c +++ b/tests/virtio-ccw-test.c @@ -45,10 +45,12 @@ static void virtio_serial_nop(void) =20 static void virtio_serial_hotplug(void) { - global_qtest =3D qtest_initf("-device virtio-serial-ccw"); - qtest_qmp_device_add("virtserialport", "hp-port", "{}"); - qtest_qmp_device_del("hp-port"); - qtest_end(); + QTestState *qts =3D qtest_initf("-device virtio-serial-ccw"); + + qtest_qmp_device_add(qts, "virtserialport", "hp-port", "{}"); + qtest_qmp_device_del(qts, "hp-port"); + + qtest_quit(qts); } =20 static void virtio_blk_nop(void) @@ -78,14 +80,14 @@ static void virtio_scsi_nop(void) =20 static void virtio_scsi_hotplug(void) { - global_qtest =3D qtest_initf("-drive if=3Dnone,id=3Ddrv0,file=3Dnull-c= o://,format=3Draw " + QTestState *s =3D qtest_initf("-drive if=3Dnone,id=3Ddrv0,file=3Dnull-= co://,format=3Draw " "-drive if=3Dnone,id=3Ddrv1,file=3Dnull-co= ://,format=3Draw " "-device virtio-scsi-ccw " "-device scsi-hd,drive=3Ddrv0"); - qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drv1'}"); - qtest_qmp_device_del("scsihd"); + qtest_qmp_device_add(s, "scsi-hd", "scsihd", "{'drive': 'drv1'}"); + qtest_qmp_device_del(s, "scsihd"); =20 - qtest_end(); + qtest_quit(s); } =20 int main(int argc, char **argv) diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 1071dd82c9..840875aaae 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -174,7 +174,7 @@ static void hotplug(void *obj, void *data, QGuestAlloca= tor *t_alloc) QTestState *qts =3D dev->pdev->bus->qts; const char *arch =3D qtest_get_arch(); =20 - qtest_qmp_device_add("virtio-net-pci", "net1", + qtest_qmp_device_add(qts, "virtio-net-pci", "net1", "{'addr': %s}", stringify(PCI_SLOT_HP)); =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c index a38a0d175b..092ba13068 100644 --- a/tests/virtio-rng-test.c +++ b/tests/virtio-rng-test.c @@ -22,7 +22,7 @@ static void rng_hotplug(void *obj, void *data, QGuestAllo= cator *alloc) =20 const char *arch =3D qtest_get_arch(); =20 - qtest_qmp_device_add("virtio-rng-pci", "rng1", + qtest_qmp_device_add(qts, "virtio-rng-pci", "rng1", "{'addr': %s}", stringify(PCI_SLOT_HP)); =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 6f8b310cf8..928b400341 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -150,8 +150,10 @@ static QVirtioSCSIQueues *qvirtio_scsi_init(QVirtioDev= ice *dev) =20 static void hotplug(void *obj, void *data, QGuestAllocator *alloc) { - qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drv1'}"); - qtest_qmp_device_del("scsihd"); + QTestState *qts =3D global_qtest; + + qtest_qmp_device_add(qts, "scsi-hd", "scsihd", "{'drive': 'drv1'}"); + qtest_qmp_device_del(qts, "scsihd"); } =20 /* Test WRITE SAME with the lba not aligned */ diff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c index 066ca61280..e584ad76e8 100644 --- a/tests/virtio-serial-test.c +++ b/tests/virtio-serial-test.c @@ -20,8 +20,8 @@ static void virtio_serial_nop(void *obj, void *data, QGue= stAllocator *alloc) =20 static void serial_hotplug(void *obj, void *data, QGuestAllocator *alloc) { - qtest_qmp_device_add("virtserialport", "hp-port", "{}"); - qtest_qmp_device_del("hp-port"); + qtest_qmp_device_add(global_qtest, "virtserialport", "hp-port", "{}"); + qtest_qmp_device_del(global_qtest, "hp-port"); } =20 static void register_virtio_serial_test(void) --=20 2.18.1 From nobody Fri Apr 26 21:06:57 2024 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=1565688887; cv=none; d=zoho.com; s=zohoarc; b=MrSJDD/iNPT39MpGFe2Ntrc+MFNkG8nMOUJlTin4peMeVEgpuX7PrDx2thrXlh8i0dtF4Z4HM6x0WgxMOnxTMDjPBHgqbw09YQGi6j/J8yxVRqvT6KZeaSnVKlnwhjrk27DHVuVNOE+WA9yPBRn5M5Tde6khrNzzFeKCr7pbSNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565688887; 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=ZW7EWX2HVPsxGVLDiK/XK1LIm+qyqcoeXxMxh8HCf5o=; b=MlJIfNf0u8WoUijW5AiKeJlok/XNYMZ4ZMRQqk1+wip8NnWlaPNmfoIzpn+jwMsxDIb6KRT2Jsv/IgLWF4MDjgpRQ+DnVj1kPLkKLQnP0RWmNEEJ47KPoCErGUcRCzIldqWlM+q3sNMIdOL12hL/Js5g2/g9m+5SDbNPkANV/3w= 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 1565688887408786.4225150091006; Tue, 13 Aug 2019 02:34:47 -0700 (PDT) Received: from localhost ([::1]:50604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxTCQ-00031S-Fp for importer@patchew.org; Tue, 13 Aug 2019 05:34:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53640) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxT9i-0007ae-30 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxT9h-0005Sx-2s for qemu-devel@nongnu.org; Tue, 13 Aug 2019 05:31:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54137) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxT9e-0005RE-HM; Tue, 13 Aug 2019 05:31:46 -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 CF69010C6B; Tue, 13 Aug 2019 09:31:45 +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 8DB827D49A; Tue, 13 Aug 2019 09:31:33 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 11:30:47 +0200 Message-Id: <20190813093047.27948-7-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.38]); Tue, 13 Aug 2019 09:31:45 +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 6/6] tests/libqtest: Make qmp_assert_success() 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 normal libqtest library functions should never depend on global_qtest. Pass in the test state via parameter instead. And while we're at it, also rename this function to qtest_qmp_assert_success() to make it clear that it is part of libqtest. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- tests/libqtest.c | 4 ++-- tests/libqtest.h | 6 ++++-- tests/virtio-scsi-test.c | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 19c1fc2e97..eb971d0d11 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -1111,13 +1111,13 @@ QDict *qmp(const char *fmt, ...) return response; } =20 -void qmp_assert_success(const char *fmt, ...) +void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...) { va_list ap; QDict *response; =20 va_start(ap, fmt); - response =3D qtest_vqmp(global_qtest, fmt, ap); + response =3D qtest_vqmp(qts, fmt, ap); va_end(ap); =20 g_assert(response); diff --git a/tests/libqtest.h b/tests/libqtest.h index d93144fb74..7833148358 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -666,7 +666,8 @@ static inline void qtest_end(void) QDict *qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2); =20 /** - * qmp_assert_success: + * qtest_qmp_assert_success: + * @qts: QTestState instance to operate on * @fmt...: QMP message to send to qemu, formatted like * qobject_from_jsonf_nofail(). See parse_escape() for what's * supported after '%'. @@ -674,7 +675,8 @@ QDict *qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2); * Sends a QMP message to QEMU and asserts that a 'return' key is present = in * the response. */ -void qmp_assert_success(const char *fmt, ...) GCC_FMT_ATTR(1, 2); +void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); =20 /* * qmp_eventwait: diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 928b400341..6068b22986 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -225,7 +225,8 @@ static void test_iothread_attach_node(void *obj, void *= data, mkqcow2(tmp_path, 64); =20 /* Attach the overlay to the null0 node */ - qmp_assert_success("{'execute': 'blockdev-add', 'arguments': {" + qtest_qmp_assert_success(scsi_pci->pci_vdev.pdev->bus->qts, + "{'execute': 'blockdev-add', 'arguments': {" " 'driver': 'qcow2', 'node-name': 'overlay'," " 'backing': 'null0', 'file': {" " 'driver': 'file', 'filename': %s}}}", tmp_pat= h); --=20 2.18.1