[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [qemu PATCH] pc.h: move x-mach-use-reliable-get-clock c
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [qemu PATCH] pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8 |
Date: |
Fri, 20 Jan 2017 13:23:12 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
On 18/01/2017 18:53, Marcelo Tosatti wrote:
>
> 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>
>
>
> 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",\
>
>
Queued, thanks.
Paolo