From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52946)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNWa-000560-BL
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:56:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNWS-0005O5-NJ
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:56:24 -0400
Received: from mx1.redhat.com ([209.132.183.28]:50511)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNWS-0005Nv-GC
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:56:16 -0400
Date: Wed, 2 Apr 2014 18:56:51 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140402155651.GB11987@redhat.com>
References: <1396452782-21473-1-git-send-email-pbonzini@redhat.com>
	<CAFEAcA86mS9p6JZ=FNip+M35BsFVFFYHT6F8EZPP6Vr2p-9PSA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFEAcA86mS9p6JZ=FNip+M35BsFVFFYHT6F8EZPP6Vr2p-9PSA@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in
 cpu/msr_hyperv_hypercall subsection
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>

On Wed, Apr 02, 2014 at 04:42:08PM +0100, Peter Maydell wrote:
> On 2 April 2014 16:33, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > The subsection already exists in one well-known enterprise Linux
> > distribution, but for some strange reason the fields were swapped
> > when forward-porting the patch to upstream.
> >
> > Limit headaches for said enterprise Linux distributor when the
> > time will come to rebase their version of QEMU.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >  target-i386/machine.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/target-i386/machine.c b/target-i386/machine.c
> > index 24bc373..168cab6 100644
> > --- a/target-i386/machine.c
> > +++ b/target-i386/machine.c
> > @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = {
> >      .minimum_version_id = 1,
> >      .minimum_version_id_old = 1,
> >      .fields      = (VMStateField []) {
> > -        VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU),
> >          VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU),
> > +        VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU),
> >          VMSTATE_END_OF_LIST()
> >      }
> 
> Surely this is a migration compatibility break and you need to bump
> the version fields here?
> 
> thanks
> -- PMM

Not if we fix it before we put out 2.0.