From: "Eugenio Pérez" <eperezma@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: "kvm list" <kvm@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Christian Borntraeger" <borntraeger@de.ibm.com>
Subject: [PATCH 6/8] tools/virtio: Extract virtqueue initialization in vq_reset
Date: Fri, 3 Apr 2020 18:51:17 +0200 [thread overview]
Message-ID: <20200403165119.5030-7-eperezma@redhat.com> (raw)
In-Reply-To: <20200403165119.5030-1-eperezma@redhat.com>
So we can reset after that in the main loop
---
tools/virtio/virtio_test.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index 9b730434997c..7b7829e510c0 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -95,6 +95,19 @@ void vhost_vq_setup(struct vdev_info *dev, struct vq_info *info)
assert(r >= 0);
}
+static void vq_reset(struct vq_info *info, int num, struct virtio_device *vdev)
+{
+ if (info->vq)
+ vring_del_virtqueue(info->vq);
+
+ memset(info->ring, 0, vring_size(num, 4096));
+ vring_init(&info->vring, num, info->ring, 4096);
+ info->vq = __vring_new_virtqueue(info->idx, info->vring, vdev, true,
+ false, vq_notify, vq_callback, "test");
+ assert(info->vq);
+ info->vq->priv = info;
+}
+
static void vq_info_add(struct vdev_info *dev, int num)
{
struct vq_info *info = &dev->vqs[dev->nvqs];
@@ -104,13 +117,7 @@ static void vq_info_add(struct vdev_info *dev, int num)
info->call = eventfd(0, EFD_NONBLOCK);
r = posix_memalign(&info->ring, 4096, vring_size(num, 4096));
assert(r >= 0);
- memset(info->ring, 0, vring_size(num, 4096));
- vring_init(&info->vring, num, info->ring, 4096);
- info->vq =
- __vring_new_virtqueue(info->idx, info->vring, &dev->vdev, true,
- false, vq_notify, vq_callback, "test");
- assert(info->vq);
- info->vq->priv = info;
+ vq_reset(info, num, &dev->vdev);
vhost_vq_setup(dev, info);
dev->fds[info->idx].fd = info->call;
dev->fds[info->idx].events = POLLIN;
--
2.18.1
next prev parent reply other threads:[~2020-04-03 16:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 16:51 [PATCH 0/8] tools/vhost: Reset virtqueue on tests Eugenio Pérez
2020-04-03 16:51 ` [PATCH 1/8] tools/virtio: fix virtio_test.c indentation Eugenio Pérez
2020-04-03 16:51 ` [PATCH 2/8] vhost: Not cleaning batched descs in VHOST_SET_VRING_BASE ioctl Eugenio Pérez
2020-04-03 16:51 ` [PATCH 3/8] vhost: Replace vq->private_data access by backend accesors Eugenio Pérez
2020-04-03 16:51 ` [PATCH 4/8] vhost: Fix bad order in vhost_test_set_backend at enable Eugenio Pérez
2020-04-03 16:51 ` [PATCH 5/8] tools/virtio: Use __vring_new_virtqueue in virtio_test.c Eugenio Pérez
2020-04-03 16:51 ` Eugenio Pérez [this message]
2020-04-03 16:51 ` [PATCH 7/8] tools/virtio: Reset index in virtio_test --reset Eugenio Pérez
2020-04-03 16:51 ` [PATCH 8/8] tools/virtio: Use tools/include/list.h instead of stubs Eugenio Pérez
2020-04-13 11:13 ` [PATCH 0/8] tools/vhost: Reset virtqueue on tests Michael S. Tsirkin
2020-04-13 14:50 ` Eugenio Perez Martin
2020-04-13 15:04 ` Michael S. Tsirkin
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=20200403165119.5030-7-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).