Re: [Qemu-devel] [PATCH] linux-user: fix broken cpu_copy()

[Andreas Färber]

Am 23.03.2015 um 13:55 schrieb Leon Alrae:
> New threads always point at the same env which is incorrect and usually leads
> to a crash.
> 
> Signed-off-by: Leon Alrae <address@hidden>
> ---
> Hi,
> 
> This patch fixes the bug introduced in:
> 
> commit 2994fd96d986578a342f2342501b4ad30f6d0a85
> Author: Eduardo Habkost <address@hidden>
> 
>     cpu: Make cpu_init() return QOM CPUState object
> 
> Regards,
> Leon
> ---
>  linux-user/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 6e446de..04668e8 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -3453,7 +3453,7 @@ CPUArchState *cpu_copy(CPUArchState *env)
>  {
>      CPUState *cpu = ENV_GET_CPU(env);
>      CPUState *new_cpu = cpu_init(cpu_model);
> -    CPUArchState *new_env = cpu->env_ptr;
> +    CPUArchState *new_env = new_cpu->env_ptr;
>      CPUBreakpoint *bp;
>      CPUWatchpoint *wp;
>  

Clearly my fault and might explain some breakage in our OBS,

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

Riku, are you queuing this (-rc1 tomorrow!) or should I take it for a
CPU pull?

Thanks,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)