From: "Eugenio Pérez" <eperezma@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"kvm list" <kvm@vger.kernel.org>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 3/8] vhost: Replace vq->private_data access by backend accesors
Date: Thu, 16 Apr 2020 09:56:38 +0200 [thread overview]
Message-ID: <20200416075643.27330-4-eperezma@redhat.com> (raw)
In-Reply-To: <20200416075643.27330-1-eperezma@redhat.com>
This function still places backend directly in private_data, instead of
use the accesors created on ("cbfc8f21b49a vhost: Create accessors for
virtqueues private_data"). Using accesor.
Fixes: ("7ce8cc28ce48 tools/virtio: Add --reset=random")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
drivers/vhost/test.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 251ca723ac3f..789c096e454b 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -265,7 +265,7 @@ static int vhost_test_set_features(struct vhost_test *n, u64 features)
static long vhost_test_set_backend(struct vhost_test *n, unsigned index, int fd)
{
- static void *private_data;
+ static void *backend;
const bool enable = fd != -1;
struct vhost_virtqueue *vq;
@@ -290,11 +290,11 @@ static long vhost_test_set_backend(struct vhost_test *n, unsigned index, int fd)
}
if (!enable) {
vhost_poll_stop(&vq->poll);
- private_data = vq->private_data;
- vq->private_data = NULL;
+ backend = vhost_vq_get_backend(vq);
+ vhost_vq_set_backend(vq, NULL);
} else {
r = vhost_vq_init_access(vq);
- vq->private_data = private_data;
+ vhost_vq_set_backend(vq, backend);
if (r == 0)
r = vhost_poll_start(&vq->poll, vq->kick);
}
--
2.18.1
next prev parent reply other threads:[~2020-04-16 7:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 7:56 [PATCH v2 0/8] tools/vhost: Reset virtqueue on tests Eugenio Pérez
2020-04-16 7:56 ` [PATCH v2 1/8] tools/virtio: fix virtio_test.c indentation Eugenio Pérez
2020-04-16 7:56 ` [PATCH v2 2/8] vhost: Not cleaning batched descs in VHOST_SET_VRING_BASE ioctl Eugenio Pérez
2020-04-16 7:56 ` Eugenio Pérez [this message]
2020-04-16 7:56 ` [PATCH v2 4/8] vhost: Fix bad order in vhost_test_set_backend at enable Eugenio Pérez
2020-04-16 7:56 ` [PATCH v2 5/8] tools/virtio: Use __vring_new_virtqueue in virtio_test.c Eugenio Pérez
2020-04-16 22:32 ` Michael S. Tsirkin
2020-04-17 12:24 ` Eugenio Perez Martin
2020-04-16 7:56 ` [PATCH v2 6/8] tools/virtio: Extract virtqueue initialization in vq_reset Eugenio Pérez
2020-04-16 7:56 ` [PATCH v2 7/8] tools/virtio: Reset index in virtio_test --reset Eugenio Pérez
2020-04-16 22:33 ` Michael S. Tsirkin
2020-04-17 7:04 ` Eugenio Perez Martin
2020-04-17 8:28 ` Michael S. Tsirkin
2020-04-16 7:56 ` [PATCH v2 8/8] tools/virtio: Use tools/include/list.h instead of stubs Eugenio Pérez
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=20200416075643.27330-4-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=virtualization@lists.linux-foundation.org \
/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).