[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/23] vhost: add assert() to check runtime behav
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 19/23] vhost: add assert() to check runtime behaviour |
Date: |
Fri, 24 Jun 2016 15:51:06 +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 e4eb97e..e34bd39 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1186,6 +1186,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);
@@ -1232,6 +1235,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);
@@ -1292,6 +1298,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 v2 09/23] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), (continued)
- [Qemu-devel] [PATCH v2 09/23] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 10/23] vhost: change some assert() for error_report() or silent fail, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 11/23] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 12/23] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 16/23] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 14/23] qemu-char: check socket is actually connected, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 18/23] vhost-net: success if backend has no ops->vhost_migration_done, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 17/23] get_vhost_net() should be != null after vhost_user_init, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 22/23] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 20/23] char: add chr_wait_connected callback, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 19/23] vhost: add assert() to check runtime behaviour,
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 13/23] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 21/23] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 23/23] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/06/24