update to v2.1.2

[pve-qemu-kvm.git] / debian / patches / virtio-net_drop_assert_on_vm_stop.patch

diff --git a/debian/patches/virtio-net_drop_assert_on_vm_stop.patch b/debian/patches/virtio-net_drop_assert_on_vm_stop.patch
deleted file mode 100644 (file)
index fd22c84..0000000
--- a/debian/patches/virtio-net_drop_assert_on_vm_stop.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Date: Thu, 11 Sep 2014 19:18:34 +0300\r
-From: "Michael S. Tsirkin" <mst@redhat.com>\r
-To: <qemu-devel@nongnu.org>\r
-\r
-On vm stop, vm_running state set to stopped\r
-before device is notified, so callbacks can get envoked with\r
-vm_running = false; and this is not an error.\r
-\r
-Cc: qemu-stable@nongnu.org\r
-Cc: Jason Wang <jasowang@redhat.com>\r
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\r
----\r
- hw/net/virtio-net.c | 2 --\r
- 1 file changed, 2 deletions(-)\r
-\r
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c\r
-index 826a2a5..2040eac 100644\r
---- a/hw/net/virtio-net.c\r
-+++ b/hw/net/virtio-net.c\r
-@@ -1125,8 +1125,6 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)\r
-         return num_packets;\r
-     }\r
- \r
--    assert(vdev->vm_running);\r
--\r
-     if (q->async_tx.elem.out_num) {\r
-         virtio_queue_set_notification(q->tx_vq, 0);\r
-         return num_packets;\r
--- \r
-MST\r
-\r
-\r
-\r