3a333345a6
Update to v4.2.0-rc3. Intent is to submit to Factory, and SLE-15-SP2 as well OBS-URL: https://build.opensuse.org/request/show/751303 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=513
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
|
Date: Wed, 31 Jul 2013 17:05:29 +0200
|
|
Subject: i8254: Fix migration from SLE11 SP2
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
References: bnc#812836
|
|
|
|
qemu-kvm 0.15 had a VMSTATE_UINT32(flags, PITState) field that
|
|
qemu 1.4 does not have.
|
|
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/timer/i8254_common.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
|
|
index 050875b49738809ac586ba9ed259..59aa28b8a72590e7fdda0feecefe 100644
|
|
--- a/hw/timer/i8254_common.c
|
|
+++ b/hw/timer/i8254_common.c
|
|
@@ -224,6 +224,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id)
|
|
return 0;
|
|
}
|
|
|
|
+static bool is_qemu_kvm(void *opaque, int version_id)
|
|
+{
|
|
+ /* HACK: We ignore incoming migration from upstream qemu */
|
|
+ return version_id < 3;
|
|
+}
|
|
+
|
|
static const VMStateDescription vmstate_pit_common = {
|
|
.name = "i8254",
|
|
.version_id = 3,
|
|
@@ -231,6 +237,7 @@ static const VMStateDescription vmstate_pit_common = {
|
|
.pre_save = pit_dispatch_pre_save,
|
|
.post_load = pit_dispatch_post_load,
|
|
.fields = (VMStateField[]) {
|
|
+ VMSTATE_UNUSED_TEST(is_qemu_kvm, 4),
|
|
VMSTATE_UINT32_V(channels[0].irq_disabled, PITCommonState, 3),
|
|
VMSTATE_STRUCT_ARRAY(channels, PITCommonState, 3, 2,
|
|
vmstate_pit_channel, PITChannelState),
|