* [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU()
@ 2013-07-26 15:44 Andreas Färber
2013-07-26 19:07 ` Riku Voipio
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Färber @ 2013-07-26 15:44 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Andreas Färber
This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU()
2013-07-26 15:44 [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU() Andreas Färber
@ 2013-07-26 19:07 ` Riku Voipio
0 siblings, 0 replies; 2+ messages in thread
From: Riku Voipio @ 2013-07-26 19:07 UTC (permalink / raw)
To: Andreas Färber; +Cc: Riku Voipio, qemu-devel
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 <afaerber@suse.de>
Acked-by: Riku Voipio <riku.voipio@iki.fi>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-26 19:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-26 15:44 [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid redundant ENV_GET_CPU() Andreas Färber
2013-07-26 19:07 ` Riku Voipio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).