From: Avi Kivity <avi@redhat.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: KVM list <kvm@vger.kernel.org>
Subject: Reconciling qemu-kvm and qemu's PIT
Date: Tue, 28 Feb 2012 16:32:54 +0200 [thread overview]
Message-ID: <4F4CE596.9070302@redhat.com> (raw)
VMStateDescription vmstate_pit = {
.name = "i8254",
.version_id = 3,
.minimum_version_id = 2,
.minimum_version_id_old = 1,
.load_state_old = pit_load_old,
.fields = (VMStateField []) {
<<<<<<< HEAD
VMSTATE_UINT32(flags, PITState),
||||||| merged common ancestors
=======
VMSTATE_UINT32_V(channels[0].irq_disabled, PITState, 3),
>>>>>>> ce967e2f33861b0e17753f97fa4527b5943c94b6
VMSTATE_STRUCT_ARRAY(channels, PITState, 3, 2,
vmstate_pit_channel, PITChannelState),
VMSTATE_TIMER(channels[0].irq_timer, PITState),
VMSTATE_END_OF_LIST()
}
};
I'm guessing that flags and irq_disabled are equivalent, but do they
have the same sense (that is, do the "1" values have the same meaning)?
If not, we have a migration problem.
Is it save to just adopt the new version and drop the old one?
--
error compiling committee.c: too many arguments to function
next reply other threads:[~2012-02-28 14:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 14:32 Avi Kivity [this message]
2012-02-28 14:40 ` Reconciling qemu-kvm and qemu's PIT Jan Kiszka
2012-02-28 14:42 ` Avi Kivity
2012-02-28 19:50 ` Avi Kivity
2012-02-28 21:47 ` Jan Kiszka
2012-02-29 9:29 ` Avi Kivity
2012-02-29 10:14 ` Jan Kiszka
2012-02-29 13:45 ` Avi Kivity
2012-02-29 14:24 ` Jan Kiszka
2012-02-29 14:42 ` 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=4F4CE596.9070302@redhat.com \
--to=avi@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=kvm@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).