[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is not present" |
Date: |
Fri, 29 Jul 2016 06:16:49 +0300 |
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>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <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);
}
--
MST
- [Qemu-devel] [PULL 20/41] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), (continued)
- [Qemu-devel] [PULL 20/41] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 22/41] vhost: add missing VHOST_OPS_DEBUG, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 21/41] vhost: do not assert() on vhost_ops failure, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 23/41] vhost: use error_report() instead of fprintf(stderr, ...), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 24/41] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 25/41] vhost-user: call set_msgfds unconditionally, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 26/41] vhost-user: check qemu_chr_fe_set_msgfds() return value, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 27/41] vhost-user: check vhost_user_{read, write}() return value, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 29/41] vhost-user: add get_vhost_net() assertions, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is not present",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 31/41] vhost-net: vhost_migration_done is vhost-user specific, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 32/41] vhost: add assert() to check runtime behaviour, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 33/41] char: add chr_wait_connected callback, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 34/41] char: add and use tcp_chr_wait_connected, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 36/41] tests: plug some leaks in virtio-net-test, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 37/41] tests: fix vhost-user-test leak, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_write(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 39/41] vhost: add vhost_net_set_backend(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 41/41] mptsas: Fix a migration compatible issue, Michael S. Tsirkin, 2016/07/28