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 <pbonz...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@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
