update to v2.1.2

diff --git a/Makefile b/Makefile
index 5c9da6bcc237a2d39666f7c434997dac5a295be1..b87d71f2805c761c4c13f8718a9beb1e92fa57d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=3.3
 
 # also update debian/changelog
 KVMVER=2.1
-KVMPKGREL=8
+KVMPKGREL=9
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -19,7 +19,7 @@ all: ${KVM_DEB} ${KVMSRC}
 download:
        rm -rf ${KVMDIR} ${KVMSRC}
        git clone git://git.qemu-project.org/qemu.git -b stable-2.1 ${KVMDIR} 
-       cd ${KVMDIR}; git checkout v2.1.1
+       cd ${KVMDIR}; git checkout v2.1.2
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${KVM_DEB} kvm: ${KVMSRC}

diff --git a/debian/changelog b/debian/changelog
index cb51e61e9e4818de8873f408b9411358728d21b5..69236c05b10f27f28820e7d8158bf63598f9ce7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pve-qemu-kvm (2.1-9) unstable; urgency=low
+
+  * update to v2.1.2
+  
+  * remove temporary patches (now upstream)
+    - virtio-net_drop_assert_on_vm_stop.patch
+    - revert_virtio_dont_call_device_on_not_vm_running.patch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Sep 2014 11:25:57 +0200
+
 pve-qemu-kvm (2.1-8) unstable; urgency=low
 
   * apply patches/hotfix for virtio-net migration problem in 2.1.1

diff --git a/debian/patches/revert_virtio_dont_call_device_on_not_vm_running.patch b/debian/patches/revert_virtio_dont_call_device_on_not_vm_running.patch
deleted file mode 100644 (file)
index d27fd49..0000000
--- a/debian/patches/revert_virtio_dont_call_device_on_not_vm_running.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Date: Thu, 11 Sep 2014 19:18:37 +0300\r
-From: "Michael S. Tsirkin" <mst@redhat.com>\r
-To: <qemu-devel@nongnu.org>\r
-\r
-This reverts commit a1bc7b827e422e1ff065640d8ec5347c4aadfcd8.\r
-    virtio: don't call device on !vm_running\r
-It turns out that virtio net assumes that vm_running\r
-is updated before device status callback in many places,\r
-so this change leads to asserts.\r
-Previous commit fixes the root issue that motivated\r
-a1bc7b827e422e1ff065640d8ec5347c4aadfcd8 differently,\r
-so there's no longer a need for this change.\r
-\r
-In the future, we might be able to drop checking vm_running\r
-completely, and check vm state directly.\r
-\r
-Reported-by: Dietmar Maurer <dietmar@proxmox.com>\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/virtio/virtio.c | 9 +--------\r
- 1 file changed, 1 insertion(+), 8 deletions(-)\r
-\r
-diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c\r
-index ac22238..5c98180 100644\r
---- a/hw/virtio/virtio.c\r
-+++ b/hw/virtio/virtio.c\r
-@@ -1108,10 +1108,7 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state)\r
-     BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));\r
-     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);\r
-     bool backend_run = running && (vdev->status & VIRTIO_CONFIG_S_DRIVER_OK);\r
--\r
--    if (running) {\r
--        vdev->vm_running = running;\r
--    }\r
-+    vdev->vm_running = running;\r
- \r
-     if (backend_run) {\r
-         virtio_set_status(vdev, vdev->status);\r
-@@ -1124,10 +1121,6 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state)\r
-     if (!backend_run) {\r
-         virtio_set_status(vdev, vdev->status);\r
-     }\r
--\r
--    if (!running) {\r
--        vdev->vm_running = running;\r
--    }\r
- }\r
- \r
- void virtio_init(VirtIODevice *vdev, const char *name,\r
--- \r
-MST\r
-\r
-\r

diff --git a/debian/patches/series b/debian/patches/series
index a0868a1fb6511e2e0ef04f03a99f84832c66c396..1381414b6fabbbfea5a3396574c4cfbc7e979df1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,5 +27,3 @@ disable-efi-enable-pxe-roms.patch
 backup-vma-allow-empty-backups.patch
 glusterfs-daemonize.patch
 gluster-backupserver.patch
-virtio-net_drop_assert_on_vm_stop.patch
-revert_virtio_dont_call_device_on_not_vm_running.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

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index efa69bfb888212b85ff8f0fc357b7f3b940d4aef..7abf0c669e047e7b177b4527ab47782827d0e25b 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ