31 lines
1016 B
Diff
31 lines
1016 B
Diff
From b6bb785977e725e1a0f3ed203f5ffe3def56e03f Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Thu, 11 Sep 2014 18:32:51 +0300
|
|
Subject: [PATCH] virtio-net: drop assert on vm stop
|
|
|
|
On vm stop, vm_running state set to stopped
|
|
before device is notified, so callbacks can get envoked with
|
|
vm_running = false; and this is not an error.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 131c5221fe25a9547c4a388a3d26ff7fd14843e5)
|
|
---
|
|
hw/net/virtio-net.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 826a2a5..2040eac 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -1125,8 +1125,6 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
|
|
return num_packets;
|
|
}
|
|
|
|
- assert(vdev->vm_running);
|
|
-
|
|
if (q->async_tx.elem.out_num) {
|
|
virtio_queue_set_notification(q->tx_vq, 0);
|
|
return num_packets;
|