64435eabdc
Update to v4.1.0. Also includes other major packaging changes as follows: There is a new package maintenance workflow - see README.PACKAGING for details. The sibling packages qemu-linux-user and qemu-testsuite are now created with the Build Service's MultiBuild feature. This also necessitates combining the qemu-linux-user changelog content back into qemu's. Luckily the delta there is quite small. Note that the qemu spec file is now that much busier, but added section markers should help reduce the confusion. Also qemu is being enabled for RISCV host compatibility, so some changes are related to that as well. OBS-URL: https://build.opensuse.org/request/show/730437 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=487
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 76ca6ec4446998f62d384a909814..fb9d5047f8c50df8ad0e662a42ac 100644
|
|
--- a/hw/timer/i8254_common.c
|
|
+++ b/hw/timer/i8254_common.c
|
|
@@ -261,6 +261,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,
|
|
@@ -270,6 +276,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),
|