|
 |
05bba0 |
From 83375cf67c9567c94808e70fa9def3383a97320c Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: Amos Kong <akong@redhat.com>
|
|
|
05bba0 |
Date: Fri, 19 Dec 2014 13:51:53 +0100
|
|
|
05bba0 |
Subject: [PATCH 02/16] virtio-net: drop assert on vm stop
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <1418997113-32517-1-git-send-email-akong@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 62996
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH] virtio-net: drop assert on vm stop
|
|
|
05bba0 |
Bugzilla: 1139562
|
|
|
05bba0 |
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
On vm stop, vm_running state set to stopped
|
|
|
05bba0 |
before device is notified, so callbacks can get envoked with
|
|
|
05bba0 |
vm_running = false; and this is not an error.
|
|
|
05bba0 |
|
|
|
05bba0 |
Cc: qemu-stable@nongnu.org
|
|
|
05bba0 |
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
05bba0 |
(cherry picked from commit 131c5221fe25a9547c4a388a3d26ff7fd14843e5)
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Amos Kong <akong@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
---
|
|
|
05bba0 |
hw/net/virtio-net.c | 2 --
|
|
|
05bba0 |
1 file changed, 2 deletions(-)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
|
05bba0 |
index 4a50869..3fde455 100644
|
|
|
05bba0 |
--- a/hw/net/virtio-net.c
|
|
|
05bba0 |
+++ b/hw/net/virtio-net.c
|
|
|
05bba0 |
@@ -1025,8 +1025,6 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
|
|
|
05bba0 |
return num_packets;
|
|
|
05bba0 |
}
|
|
|
05bba0 |
|
|
|
05bba0 |
- assert(vdev->vm_running);
|
|
|
05bba0 |
-
|
|
|
05bba0 |
if (q->async_tx.elem.out_num) {
|
|
|
05bba0 |
virtio_queue_set_notification(q->tx_vq, 0);
|
|
|
05bba0 |
return num_packets;
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|