Re: [Qemu-devel] [PATCH] pseries: Fix breakage in CPU QOM conversion

[Andreas Färber]

Am 15.03.2013 04:59, schrieb David Gibson:
> Commit 259186a7d2f7184efc96ae99bc5658e6159f53ad "cpu: Move halted and
> interrupt_request fields to CPUState" broke the pseries machine.  That's
> because it uses CPU() instead of ENV_GET_CPU() to convert from the global
> first_cpu pointer (still a CPUArchState) to a CPUState.  This patch fixes
> the breakage.
> 
> Cc: Andreas Färber <address@hidden>
> Signed-off-by: David Gibson <address@hidden>
> ---
>  hw/ppc/spapr.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 0c51d04..b776d34 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -645,7 +645,7 @@ static void ppc_spapr_reset(void)
>                         spapr->rtas_size);
>  
>      /* Set up the entry state */
> -    first_cpu_cpu = CPU(first_cpu);
> +    first_cpu_cpu = ENV_GET_CPU(first_cpu);
>      first_cpu->gpr[3] = spapr->fdt_addr;
>      first_cpu->gpr[5] = 0;
>      first_cpu_cpu->halted = 0;

Oops,

Acked-by: Andreas Färber <address@hidden>

Did you check the commit if there's more instances of that bug?

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg