From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Reconciling qemu-kvm and qemu's PIT
Date: Tue, 28 Feb 2012 16:32:54 +0200
Message-ID: <4F4CE596.9070302@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: KVM list <kvm@vger.kernel.org>
To: Jan Kiszka <jan.kiszka@siemens.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:42864 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755541Ab2B1OdA (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 28 Feb 2012 09:33:00 -0500
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>


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