aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2017-01-18 15:53:45 -0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-01-20 13:22:57 +0100
commitabc62c89f3191774dbd600a2caec803cbf557160 (patch)
tree58a6a7bfba1fdfa23bab55c7b50b1a5f2d3644d3
parente12ed72e5c00dd3375b8bd107200e4d7e950276a (diff)
pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8
As noticed by David Gilbert, commit 6053a86 'kvmclock: reduce kvmclock differences on migration' added 'x-mach-use-reliable-get-clock' and a compatibility entry that turns it off; however it got merged after 2.8.0 was released but the entry has gone into PC_COMPAT_2_7 where it should have gone into PC_COMPAT_2_8. Fix it by moving the entry to PC_COMPAT_2_8. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20170118175343.GA26873@amt.cnet> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/hw/i386/pc.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b22e699c46..738bfd6c60 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -375,14 +375,15 @@ int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
#define PC_COMPAT_2_8 \
-
-#define PC_COMPAT_2_7 \
- HW_COMPAT_2_7 \
+ HW_COMPAT_2_8 \
{\
.driver = "kvmclock",\
.property = "x-mach-use-reliable-get-clock",\
.value = "off",\
},\
+
+#define PC_COMPAT_2_7 \
+ HW_COMPAT_2_7 \
{\
.driver = TYPE_X86_CPU,\
.property = "l3-cache",\