[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/35] pc.h: move x-mach-use-reliable-get-clock compa
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/35] pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8 |
Date: |
Fri, 20 Jan 2017 14:31:39 +0100 |
From: Marcelo Tosatti <address@hidden>
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 <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/hw/i386/pc.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b22e699..738bfd6 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",\
--
2.9.3
- [Qemu-devel] [PULL 22/35] x86: ioapic: add traces for ioapic, (continued)
- [Qemu-devel] [PULL 22/35] x86: ioapic: add traces for ioapic, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 24/35] x86: ioapic: fix fail migration when irqchip=split, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 23/35] x86: ioapic: dump version for "info ioapic", Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 26/35] char: fix ctrl-a b not working, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 27/35] ramblock-notifier: new, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 28/35] KVM: PPC: eliminate unnecessary duplicate constants, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 29/35] kvm: move cpu synchronization code, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 32/35] hax: add Darwin support, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 31/35] Plumb the HAXM-based hardware acceleration support, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 33/35] Revert "win32: don't run subprocess tests on Mingw32 platform", Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 35/35] pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8,
Paolo Bonzini <=
- [Qemu-devel] [PULL 34/35] bitmap: assert that start and nr are non negative, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 30/35] target/i386: Add Intel HAX files, Paolo Bonzini, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, no-reply, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, Peter Maydell, 2017/01/23