[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/23] Revert "vhost-net: do not crash if backend
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 16/23] Revert "vhost-net: do not crash if backend is not present" |
Date: |
Fri, 24 Jun 2016 15:51:03 +0200 |
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 08c7d1e..f1dd367 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -428,15 +428,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 v2 08/23] vhost-net: always call vhost_dev_cleanup() on failure, (continued)
- [Qemu-devel] [PATCH v2 08/23] vhost-net: always call vhost_dev_cleanup() on failure, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 04/23] vhost: make vhost_log_put() idempotent, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 05/23] vhost: call vhost_log_put() on cleanup, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 06/23] vhost: add vhost device only after all success, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 07/23] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 15/23] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/06/24
- [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 <=
- [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, 2016/06/24
- [Qemu-devel] [PATCH v2 13/23] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/06/24