public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: "Zhang, Yang Z" <yang.z.zhang@intel.com>,
	"Ren, Yongjie" <yongjie.ren@intel.com>,
	KVM list <kvm@vger.kernel.org>
Subject: [PATCH] qemu-kvm: Fix migration from older version due to i8254 changes
Date: Fri, 02 Mar 2012 10:21:22 +0100	[thread overview]
Message-ID: <4F509112.8020908@siemens.com> (raw)
In-Reply-To: <A9667DDFB95DB7438FA9D7D576C3D87E0852CF@SHSMSX101.ccr.corp.intel.com>

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@siemens.com>
---
 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

  reply	other threads:[~2012-03-02  9:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-02  6:33 can't restore a guest saved by an older qemu Ren, Yongjie
2012-03-02  8:47 ` Jan Kiszka
2012-03-02  8:58   ` Zhang, Yang Z
2012-03-02  9:21     ` Jan Kiszka [this message]
2012-03-02  9:32       ` [PATCH] qemu-kvm: Fix migration from older version due to i8254 changes Ren, Yongjie
2012-03-07 10:48       ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F509112.8020908@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=yang.z.zhang@intel.com \
    --cc=yongjie.ren@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox