| Message ID | 20170118175343.GA26873@amt.cnet |
|---|---|
| State | New |
| Headers | show |
* Marcelo Tosatti (mtosatti@redhat.com) 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 <mtosatti@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > 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",\ > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
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 <mtosatti@redhat.com> > > > 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
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",\
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>