From 00b676aee83552caf283eb5f96bbeef2b63fbf3f Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 24 Feb 2015 17:39:08 +0100 Subject: [PATCH] bump version to 2.2-7 --- Makefile | 4 +-- debian/changelog | 7 ++++ ...ix-mc146818rtc-wrong-subsection-name.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-mc146818rtc-wrong-subsection-name.patch diff --git a/Makefile b/Makefile index d5bfbf5..def35b9 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -RELEASE=3.3 +RELEASE=3.4 # also update debian/changelog KVMVER=2.2 -KVMPKGREL=6 +KVMPKGREL=7 KVMPACKAGE=pve-qemu-kvm KVMDIR=qemu-kvm diff --git a/debian/changelog b/debian/changelog index b922a7c..73f8757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pve-qemu-kvm (2.2-7) unstable; urgency=low + + * fix mc146818rtc wrong subsection name to avoid + vmstate_subsection_load() fail. + + -- Proxmox Support Team Tue, 24 Feb 2015 17:38:31 +0100 + pve-qemu-kvm (2.2-6) unstable; urgency=low * qmp: fix backup-cancel diff --git a/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch b/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch new file mode 100644 index 0000000..e67465e --- /dev/null +++ b/debian/patches/fix-mc146818rtc-wrong-subsection-name.patch @@ -0,0 +1,35 @@ +To: qemu-devel@nongnu.org +Date: Thu, 5 Feb 2015 17:24:27 +0100 +Subject: [Qemu-devel] [PULL 10/10] fix mc146818rtc wrong subsection name to + avoid vmstate_subsection_load() fail + +From: Zhang Haoyu + +fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail +during incoming migration or loadvm. + +Signed-off-by: Zhang Haoyu +Reviewed-by: Paolo Bonzini +Signed-off-by: Juan Quintela +--- + hw/timer/mc146818rtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c +index 5a107fa..0600c9a 100644 +--- a/hw/timer/mc146818rtc.c ++++ b/hw/timer/mc146818rtc.c +@@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id) + } + + static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { +- .name = "irq_reinject_on_ack_count", ++ .name = "mc146818rtc/irq_reinject_on_ack_count", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { +-- +2.1.0 + + + diff --git a/debian/patches/series b/debian/patches/series index 14c982f..20a5ac7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,3 +30,4 @@ backup-vma-allow-empty-backups.patch glusterfs-daemonize.patch gluster-backupserver.patch add-qmp-get-link-status.patch +fix-mc146818rtc-wrong-subsection-name.patch -- 2.39.2