render / rpms / qemu

Forked from rpms/qemu 9 months ago
Clone

Blame 0006-virtio-net-drop-assert-on-vm-stop.patch

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