From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Fix migration from older version due to i8254 changes Date: Fri, 02 Mar 2012 10:21:22 +0100 Message-ID: <4F509112.8020908@siemens.com> References: <1B4B44D9196EFF41AE41FDA404FC0A10053959@SHSMSX101.ccr.corp.intel.com> <4F50893E.8090006@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "Zhang, Yang Z" , "Ren, Yongjie" , KVM list To: Avi Kivity , Marcelo Tosatti Return-path: Received: from goliath.siemens.de ([192.35.17.28]:20991 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757826Ab2CBJVc (ORCPT ); Fri, 2 Mar 2012 04:21:32 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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