]> git.proxmox.com Git - mirror_qemu.git/commitdiff
pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 18 Jan 2017 17:53:45 +0000 (15:53 -0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 20 Jan 2017 12:22:57 +0000 (13:22 +0100)
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>
include/hw/i386/pc.h

index b22e699c46cd6ebe31e466e5813809f65eed963d..738bfd6c6054bc3469aec4a58b133844bb9afa70 100644 (file)
@@ -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",\