[PATCH] qemu-kvm: Fix migration from older version due to i8254 changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Old qemu-kvm already contained an equivalent field to i8254's
irq_disabled. We therefore have to remove upstream's version restriction
here to allow migration from older versions.

Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
 hw/i8254.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/i8254.c b/hw/i8254.c
index e5cda2f..33d94e1 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -469,7 +469,7 @@ VMStateDescription vmstate_pit = {
     .minimum_version_id_old = 1,
     .load_state_old = pit_load_old,
     .fields      = (VMStateField []) {
-        VMSTATE_UINT32_V(channels[0].irq_disabled, PITState, 3),
+        VMSTATE_UINT32(channels[0].irq_disabled, PITState), /* qemu-kvm's v2 had 'flags' here */
         VMSTATE_STRUCT_ARRAY(channels, PITState, 3, 2, vmstate_pit_channel, PITChannelState),
         VMSTATE_TIMER(channels[0].irq_timer, PITState),
         VMSTATE_END_OF_LIST()
-- 
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux