From: Paolo Bonzini Date: Wed, 2 Apr 2014 15:33:02 +0000 (+0200) Subject: target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~42^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=466e6e9d13d56bbb6da1d2396d7d6347df483af0;p=sdk%2Femulator%2Fqemu.git target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 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 Message-id: 1396452782-21473-1-git-send-email-pbonzini@redhat.com Reviewed-by: Michael S. Tsirkin Signed-off-by: Peter Maydell --- diff --git a/target-i386/machine.c b/target-i386/machine.c index 24bc373b9c..168cab681b 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() } };