diff options
| author | Si-Wei Liu <si-wei.liu@oracle.com> | 2022-05-06 19:28:15 -0700 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2022-05-16 16:15:41 -0400 |
| commit | 6f3910b5eee00b8cc959e94659c0d524c482a418 (patch) | |
| tree | 5ac178337825a809709fe8bf1cef07b0ac56432b /hw/net | |
| parent | 9bd055073e375c8a0d7ebce925e05d914d69fc7f (diff) | |
| download | qemu-6f3910b5eee00b8cc959e94659c0d524c482a418.zip qemu-6f3910b5eee00b8cc959e94659c0d524c482a418.tar.gz qemu-6f3910b5eee00b8cc959e94659c0d524c482a418.tar.bz2 | |
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>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/vhost_net.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index df0f050..ccac5b7 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -381,6 +381,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; } } @@ -390,7 +391,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); |