[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 19/31] Revert "vhost-net: do not crash if backend
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v5 19/31] Revert "vhost-net: do not crash if backend is not present" |
Date: |
Thu, 21 Jul 2016 12:57:38 +0400 |
From: Marc-André Lureau <address@hidden>
Now that get_vhost_net() returns non-null after a successful
vhost_net_init(), we no longer need to check this case.
This reverts commit ecd34898596c60f79886061618dd7e01001113ad.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/net/vhost_net.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 4e6495e..54cf015 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -429,15 +429,10 @@ VHostNetState *get_vhost_net(NetClientState *nc)
int vhost_set_vring_enable(NetClientState *nc, int enable)
{
VHostNetState *net = get_vhost_net(nc);
- const VhostOps *vhost_ops;
+ const VhostOps *vhost_ops = net->dev.vhost_ops;
nc->vring_enable = enable;
- if (!net) {
- return 0;
- }
-
- vhost_ops = net->dev.vhost_ops;
if (vhost_ops->vhost_set_vring_enable) {
return vhost_ops->vhost_set_vring_enable(&net->dev, enable);
}
--
2.9.0
- [Qemu-devel] [PATCH v5 09/31] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), (continued)
- [Qemu-devel] [PATCH v5 09/31] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 10/31] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 11/31] vhost: add missing VHOST_OPS_DEBUG, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 12/31] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 13/31] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 15/31] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 14/31] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 16/31] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 17/31] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 18/31] vhost-user: add get_vhost_net() assertions, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 19/31] Revert "vhost-net: do not crash if backend is not present",
marcandre . lureau <=
- [Qemu-devel] [PATCH v5 20/31] vhost-net: vhost_migration_done is vhost-user specific, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 21/31] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 22/31] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 23/31] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 24/31] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 25/31] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 26/31] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 27/31] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 28/31] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v5 29/31] vhost-user: add error report in vhost_user_write(), marcandre . lureau, 2016/07/21