From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVNkH-0007rb-Tw for qemu-devel@nongnu.org; Wed, 02 Apr 2014 12:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVNkA-0001l3-7q for qemu-devel@nongnu.org; Wed, 02 Apr 2014 12:10:33 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36252 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVNkA-0001ky-1J for qemu-devel@nongnu.org; Wed, 02 Apr 2014 12:10:26 -0400 Message-ID: <533C3670.8080309@suse.de> Date: Wed, 02 Apr 2014 18:10:24 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1396452782-21473-1-git-send-email-pbonzini@redhat.com> <20140402155651.GB11987@redhat.com> In-Reply-To: <20140402155651.GB11987@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Peter Maydell , QEMU Developers , Paolo Bonzini Am 02.04.2014 17:56, schrieb Michael S. Tsirkin: > On Wed, Apr 02, 2014 at 04:42:08PM +0100, Peter Maydell wrote: >> On 2 April 2014 16:33, Paolo Bonzini 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 >>> --- >>> 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_hyper= call_hypercall =3D { >>> .minimum_version_id =3D 1, >>> .minimum_version_id_old =3D 1, >>> .fields =3D (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 >=20 > Not if we fix it before we put out 2.0. Is the version_id important for that enterprise distribution? We usually didn't make this depend on the release but on individual changes, so PMM has a point. If someone did a savevm on master and after this patch tries to loadvm it, maybe nothing bad happens in this case but something we could easily prevent. Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg