45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 4670dbaa57d7f034c2b5720d2a4c141a82f73025 Mon Sep 17 00:00:00 2001
|
|
From: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Date: Fri, 6 May 2022 19:28:15 -0700
|
|
Subject: [PATCH 4/5] vhost-net: fix improper cleanup in vhost_net_start
|
|
|
|
vhost_net_start() missed a corresponding stop_one() upon error from
|
|
vhost_set_vring_enable(). While at it, make the error handling for
|
|
err_start more robust. No real issue was found due to this though.
|
|
|
|
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Message-Id: <1651890498-24478-5-git-send-email-si-wei.liu@oracle.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
|
|
---
|
|
hw/net/vhost_net.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
|
index e8a79db94d..1911ffd7ed 100644
|
|
--- a/hw/net/vhost_net.c
|
|
+++ b/hw/net/vhost_net.c
|
|
@@ -439,6 +439,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
|
|
r = vhost_set_vring_enable(peer, peer->vring_enable);
|
|
|
|
if (r < 0) {
|
|
+ vhost_net_stop_one(get_vhost_net(peer), dev);
|
|
goto err_start;
|
|
}
|
|
}
|
|
@@ -448,7 +449,8 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
|
|
|
|
err_start:
|
|
while (--i >= 0) {
|
|
- peer = qemu_get_peer(ncs , i);
|
|
+ peer = qemu_get_peer(ncs, i < data_queue_pairs ?
|
|
+ i : n->max_queue_pairs);
|
|
vhost_net_stop_one(get_vhost_net(peer), dev);
|
|
}
|
|
e = k->set_guest_notifiers(qbus->parent, total_notifiers, false);
|
|
--
|
|
2.27.0
|
|
|