diff mbox

vhost_net: don't enable vring if backend lack this feature

Message ID 1472892287-26001-1-git-send-email-chen_han_xiao@126.com
State New
Headers show

Commit Message

Chen Hanxiao Sept. 3, 2016, 8:44 a.m. UTC 
From: Chen Hanxiao <chenhanxiao@gmail.com>

If backend(such as dpdk) lack this feature,
don't assume it and mark it in vring_enable.
Or we may fail in vhost_net_start,
then we can't use vhost net.
This will bring compat issue with old version backend.

Signed-off-by: Chen Hanxiao <chenhanxiao@gmail.com>
---
 hw/net/vhost_net.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Chen Hanxiao Sept. 8, 2016, 7:37 a.m. UTC | #1 
At 2016-09-03 16:44:47, "Chen Hanxiao" <chen_han_xiao@126.com> wrote:
>From: Chen Hanxiao <chenhanxiao@gmail.com>
>
>If backend(such as dpdk) lack this feature,
>don't assume it and mark it in vring_enable.
>Or we may fail in vhost_net_start,
>then we can't use vhost net.
>This will bring compat issue with old version backend.
>
>Signed-off-by: Chen Hanxiao <chenhanxiao@gmail.com>
>---

Hi,

    Any comments?

Regards,
- Chen
diff mbox

Patch

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index f2d49ad..3819e65 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -425,11 +425,17 @@  int vhost_set_vring_enable(NetClientState *nc, int enable)
 {
     VHostNetState *net = get_vhost_net(nc);
     const VhostOps *vhost_ops = net->dev.vhost_ops;
-
-    nc->vring_enable = enable;
+    int ret;
 
     if (vhost_ops && vhost_ops->vhost_set_vring_enable) {
-        return vhost_ops->vhost_set_vring_enable(&net->dev, enable);
+        ret = vhost_ops->vhost_set_vring_enable(&net->dev, enable);
+        if (ret == 0) {
+            nc->vring_enable = enable;
+        } else {
+            nc->vring_enable = false;
+        }
+
+        return ret;
     }
 
     return 0;