summaryrefslogtreecommitdiffstats
path: root/target-i386/machine.c
diff options
context:
space:
mode:
authorPaolo Bonzini2014-04-02 17:33:02 +0200
committerPeter Maydell2014-04-05 11:49:05 +0200
commit466e6e9d13d56bbb6da1d2396d7d6347df483af0 (patch)
treeaec0e92bbcf113c5a474f9cf6fb2ed22816d8ebe /target-i386/machine.c
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
downloadqemu-466e6e9d13d56bbb6da1d2396d7d6347df483af0.tar.gz
qemu-466e6e9d13d56bbb6da1d2396d7d6347df483af0.tar.xz
qemu-466e6e9d13d56bbb6da1d2396d7d6347df483af0.zip
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 <pbonzini@redhat.com> Message-id: 1396452782-21473-1-git-send-email-pbonzini@redhat.com Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/machine.c')
-rw-r--r--target-i386/machine.c2
1 files changed, 1 insertions, 1 deletions
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()
}
};