From: Xie Yongji <[email protected]>

[ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ]

Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed.

Signed-off-by: Xie Yongji <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Acked-by: Jason Wang <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
 drivers/net/virtio_net.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 0824e6999e49..9007d73863d0 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3223,8 +3223,11 @@ static __maybe_unused int virtnet_restore(struct 
virtio_device *vdev)
        virtnet_set_queues(vi, vi->curr_queue_pairs);
 
        err = virtnet_cpu_notif_add(vi);
-       if (err)
+       if (err) {
+               virtnet_freeze_down(vdev);
+               remove_vq_common(vi);
                return err;
+       }
 
        return 0;
 }
-- 
2.30.2

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to