From: "Eugenio Pérez" <eperezma@redhat•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: "virtualization@lists•linux-foundation.org"
<virtualization@lists•linux-foundation.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"Halil Pasic" <pasic@linux•ibm.com>,
"Cornelia Huck" <cohuck@redhat•com>,
"Eugenio Pérez" <eperezma@redhat•com>,
"Christian Borntraeger" <borntraeger@de•ibm.com>,
"kvm list" <kvm@vger•kernel.org>,
"Stephen Rothwell" <sfr@canb•auug.org.au>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: [PATCH v3 6/8] tools/virtio: Extract virtqueue initialization in vq_reset
Date: Sat, 18 Apr 2020 12:22:15 +0200 [thread overview]
Message-ID: <20200418102217.32327-7-eperezma@redhat.com> (raw)
In-Reply-To: <20200418102217.32327-1-eperezma@redhat.com>
So we can reset after that in the main loop.
Signed-off-by: Eugenio Pérez <eperezma@redhat•com>
---
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 0a247ba3b899..bc16c818bda3 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -94,6 +94,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];
@@ -103,13 +116,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-18 10:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-18 10:22 [PATCH v3 0/8] tools/vhost: Reset virtqueue on tests Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 1/8] vhost: Not cleaning batched descs in VHOST_SET_VRING_BASE ioctl Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 2/8] tools/virtio: Add --batch option Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 3/8] tools/virtio: Add --batch=random option Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 4/8] tools/virtio: Add --reset Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 5/8] tools/virtio: Use __vring_new_virtqueue in virtio_test.c Eugenio Pérez
2020-04-18 10:22 ` Eugenio Pérez [this message]
2020-04-18 10:22 ` [PATCH v3 7/8] tools/virtio: Reset index in virtio_test --reset Eugenio Pérez
2020-04-18 10:22 ` [PATCH v3 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=20200418102217.32327-7-eperezma@redhat.com \
--to=eperezma@redhat$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=cohuck@redhat$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=pasic@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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