On 07/04/2015 15:53, Denis V. Lunev wrote:
> Replace call of cpu_is_bsp(s->cpu) which really returns
> !!(s->apicbase & MSR_IA32_APICBASE_BSP)
> with directly collected value. Due to this the tracepoint
> trace_cpu_get_apic_base((uint64_t)s->apicbase);
> will not be hit anymore in apic_reset_common.
>
> Signed-off-by: Denis V. Lunev <d...@openvz.org>
> CC: Andreas Färber <afaer...@suse.de>
> CC: Paolo Bonzini <pbonz...@redhat.com>
> ---
> hw/intc/apic_common.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
> index 042e960..7a0c7e2 100644
> --- a/hw/intc/apic_common.c
> +++ b/hw/intc/apic_common.c
> @@ -233,11 +233,10 @@ static void apic_reset_common(DeviceState *dev)
> {
> APICCommonState *s = APIC_COMMON(dev);
> APICCommonClass *info = APIC_COMMON_GET_CLASS(s);
> - bool bsp;
> + uint32_t bsp;
>
> - bsp = cpu_is_bsp(s->cpu);
> - s->apicbase = APIC_DEFAULT_ADDRESS |
> - (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;
> + bsp = s->apicbase & MSR_IA32_APICBASE_BSP;
> + s->apicbase = APIC_DEFAULT_ADDRESS | bsp | MSR_IA32_APICBASE_ENABLE;
>
> s->vapic_paddr = 0;
> info->vapic_base_update(s);
>
Applied, thanks.
Paolo
