[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 22/33] vhost: add assert() to check runtime behav
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v6 22/33] vhost: add assert() to check runtime behaviour |
Date: |
Wed, 27 Jul 2016 01:15:16 +0400 |
From: Marc-André Lureau <address@hidden>
All these functions must be called only after the backend is connected.
They are called from virtio-net.c, after either virtio or link status
change.
The check for nc->peer->link_down should ensure vhost_net_{start,stop}()
are always called between vhost_user_{start,stop}().
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/virtio/vhost.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index bb886f3..2d0d1d1 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1242,6 +1242,9 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev,
VirtIODevice *vdev, int n,
int r, index = n - hdev->vq_index;
struct vhost_vring_file file;
+ /* should only be called after backend is connected */
+ assert(hdev->vhost_ops);
+
if (mask) {
assert(vdev->use_guest_notifier_mask);
file.fd = event_notifier_get_fd(&hdev->vqs[index].masked_notifier);
@@ -1288,6 +1291,9 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice
*vdev)
{
int i, r;
+ /* should only be called after backend is connected */
+ assert(hdev->vhost_ops);
+
hdev->started = true;
r = vhost_dev_set_features(hdev, hdev->log_enabled);
@@ -1350,6 +1356,9 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice
*vdev)
{
int i;
+ /* should only be called after backend is connected */
+ assert(hdev->vhost_ops);
+
for (i = 0; i < hdev->nvqs; ++i) {
vhost_virtqueue_stop(hdev,
vdev,
--
2.9.0
- [Qemu-devel] [PATCH v6 12/33] vhost: add missing VHOST_OPS_DEBUG, (continued)
- [Qemu-devel] [PATCH v6 12/33] vhost: add missing VHOST_OPS_DEBUG, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 14/33] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 13/33] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 15/33] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 16/33] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 17/33] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 18/33] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 19/33] vhost-user: add get_vhost_net() assertions, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 20/33] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 21/33] vhost-net: vhost_migration_done is vhost-user specific, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 22/33] vhost: add assert() to check runtime behaviour,
marcandre . lureau <=
- [Qemu-devel] [PATCH v6 23/33] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 24/33] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 25/33] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 26/33] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 27/33] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 29/33] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 28/33] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 30/33] vhost-user: add error report in vhost_user_write(), marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 31/33] vhost: add vhost_net_set_backend(), marcandre . lureau, 2016/07/26