[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 17/29] vhost-user: add get_vhost_net() assertions
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v4 17/29] vhost-user: add get_vhost_net() assertions |
Date: |
Thu, 7 Jul 2016 03:00:41 +0200 |
From: Marc-André Lureau <address@hidden>
Add a few assertions to be more explicit about the runtime behaviour
after the previous patch: get_vhost_net() is non-null after
net_vhost_user_init().
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/net/vhost_net.c | 1 +
net/vhost-user.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 08c7d1e..473e6e5 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -417,6 +417,7 @@ VHostNetState *get_vhost_net(NetClientState *nc)
break;
case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
vhost_net = vhost_user_get_vhost_net(nc);
+ assert(vhost_net != NULL);
break;
default:
break;
diff --git a/net/vhost-user.c b/net/vhost-user.c
index a80f008..2442925 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -257,6 +257,8 @@ static int net_vhost_user_init(NetClientState *peer, const
char *device,
qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].name);
+ assert(s->vhost_net != NULL);
+
return 0;
}
--
2.9.0
- [Qemu-devel] [PATCH v4 06/29] vhost: fix cleanup on not fully initialized device, (continued)
- [Qemu-devel] [PATCH v4 06/29] vhost: fix cleanup on not fully initialized device, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 08/29] vhost-net: always call vhost_dev_cleanup() on failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 09/29] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 07/29] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 10/29] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 11/29] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 12/29] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 15/29] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 14/29] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 13/29] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 17/29] vhost-user: add get_vhost_net() assertions,
marcandre . lureau <=
- [Qemu-devel] [PATCH v4 16/29] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 18/29] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 19/29] vhost-net: vhost_migration_done is vhost-user specific, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 20/29] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 22/29] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 21/29] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 23/29] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 24/29] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 25/29] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/06
- [Qemu-devel] [PATCH v4 26/29] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/06