[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 19/28] vhost: add assert() to check runtime behav
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v3 19/28] vhost: add assert() to check runtime behaviour |
Date: |
Wed, 6 Jul 2016 20:47:12 +0200 |
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 752a78f..4a183d3 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1188,6 +1188,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 != NULL);
+
if (mask) {
assert(vdev->use_guest_notifier_mask);
file.fd = event_notifier_get_fd(&hdev->vqs[index].masked_notifier);
@@ -1234,6 +1237,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 != NULL);
+
hdev->started = true;
r = vhost_dev_set_features(hdev, hdev->log_enabled);
@@ -1294,6 +1300,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 != NULL);
+
for (i = 0; i < hdev->nvqs; ++i) {
vhost_virtqueue_stop(hdev,
vdev,
--
2.9.0
- [Qemu-devel] [PATCH v3 13/28] vhost-user: check vhost_user_{read, write}() return value, (continued)
- [Qemu-devel] [PATCH v3 13/28] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 14/28] qemu-char: check socket is actually connected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 15/28] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 16/28] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 17/28] get_vhost_net() should be != null after vhost_user_init, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 18/28] vhost-net: success if backend has no ops->vhost_migration_done, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 19/28] vhost: add assert() to check runtime behaviour,
marcandre . lureau <=
- [Qemu-devel] [PATCH v3 20/28] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 21/28] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 22/28] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 23/28] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 25/28] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 24/28] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 27/28] vhost-user: add error report in vhost_user_write(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 26/28] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v3 28/28] vhost: add vhost_net_set_backend(), marcandre . lureau, 2016/07/06