[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV
From: |
Riku Voipio |
Subject: |
Re: [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU() |
Date: |
Fri, 26 Jul 2013 22:07:23 +0300 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Fri, Jul 26, 2013 at 05:44:14PM +0200, Andreas Färber wrote:
> This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.
> Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Riku Voipio <address@hidden>
> ---
> 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 5dc0947..5309117 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -3637,7 +3637,7 @@ int main(int argc, char **argv, char **envp)
> exit(1);
> }
> cpu = ENV_GET_CPU(env);
> - cpu_reset(ENV_GET_CPU(env));
> + cpu_reset(cpu);
>
> thread_cpu = cpu;
>
> --
> 1.8.1.4