From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48735)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNEK-0002ek-BJ
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:37:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNEE-0006qn-78
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:37:32 -0400
Received: from mx1.redhat.com ([209.132.183.28]:30450)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1WVNED-0006pd-Ui
	for qemu-devel@nongnu.org; Wed, 02 Apr 2014 11:37:26 -0400
Date: Wed, 2 Apr 2014 18:38:00 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140402153800.GA11939@redhat.com>
References: <1396452782-21473-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1396452782-21473-1-git-send-email-pbonzini@redhat.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: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org

On Wed, Apr 02, 2014 at 05:33:02PM +0200, 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 <pbonzini@redhat.com>


Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Peter could you pick this up for 2.0 please?

Otherwise we will need to maintain 2.0
compatibility code which is annoying ...

> ---
>  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()
>      }
>  };
> -- 
> 1.9.0