update to v2.2.1, bump version to 2.2-8

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

diff --git a/debian/changelog b/debian/changelog
index 73f8757af82d0d482c2e776a7881fcf835702b2c..aea81d08f558272c8ef640648b8deb6ef9753e99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pve-qemu-kvm (2.2-8) unstable; urgency=low
+
+  * update to v2.2.1
+  
+  * remove fix-mc146818rtc-wrong-subsection-name.patch (now upstream)
+  
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Mar 2015 07:02:14 +0100
+
 pve-qemu-kvm (2.2-7) unstable; urgency=low
 
   * fix mc146818rtc wrong subsection name to avoid

diff --git a/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch b/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch
deleted file mode 100644 (file)
index e67465e..0000000
--- a/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-To: qemu-devel@nongnu.org\r
-Date: Thu,  5 Feb 2015 17:24:27 +0100\r
-Subject: [Qemu-devel] [PULL 10/10] fix mc146818rtc wrong subsection name to\r
-       avoid vmstate_subsection_load() fail\r
-\r
-From: Zhang Haoyu <zhanghy@sangfor.com.cn>\r
-\r
-fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail\r
-during incoming migration or loadvm.\r
-\r
-Signed-off-by: Zhang Haoyu <zhanghy@sangfor.com.cn>\r
-Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>\r
-Signed-off-by: Juan Quintela <quintela@redhat.com>\r
----\r
- hw/timer/mc146818rtc.c | 2 +-\r
- 1 file changed, 1 insertion(+), 1 deletion(-)\r
-\r
-diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c\r
-index 5a107fa..0600c9a 100644\r
---- a/hw/timer/mc146818rtc.c\r
-+++ b/hw/timer/mc146818rtc.c\r
-@@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id)\r
- }\r
-\r
- static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = {\r
--    .name = "irq_reinject_on_ack_count",\r
-+    .name = "mc146818rtc/irq_reinject_on_ack_count",\r
-     .version_id = 1,\r
-     .minimum_version_id = 1,\r
-     .fields = (VMStateField[]) {\r
--- \r
-2.1.0\r
-\r
-\r
-\r

diff --git a/debian/patches/series b/debian/patches/series
index 20a5ac74f2c8a509de2531fd4a45e39864042306..14c982fe57934c0e04497453864245942bfc8e4a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,4 +30,3 @@ backup-vma-allow-empty-backups.patch
 glusterfs-daemonize.patch
 gluster-backupserver.patch
 add-qmp-get-link-status.patch
-fix-mc146818rtc-wrong-subsection-name.patch

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index 15197a11822299bfe73310b6560698aa8053fc1a..8875eae7cc7b079c1efe202d5663743813f32ec8 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ