[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-1.4 2/2] linux-user: bsd-user: Don't reset X
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH for-1.4 2/2] linux-user: bsd-user: Don't reset X86CPU twice |
Date: |
Wed, 30 Jan 2013 13:01:11 +0100 |
On Wed, 30 Jan 2013 01:34:19 +0100
Andreas Färber <address@hidden> wrote:
> Since commit 65dee38052597b6285eb208125369f01b29ba6c1 (target-i386:
> move cpu_reset and reset callback to cpu.c) the x86 CPU is reset through
> cpu_init() but was still reset immediately after in linux-user and
> bsd-user. Similarly it was reset as part of cpu_copy(). Clean this up.
>
> Cc: Igor Mammedov <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>
> Cc: Peter Maydell <address@hidden>
> ---
> bsd-user/main.c | 2 +-
> exec.c | 2 +-
> linux-user/main.c | 2 +-
> 3 Dateien geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
>
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 1dc0330..ae24723 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -917,7 +917,7 @@ int main(int argc, char **argv)
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> }
> -#if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
> +#if defined(TARGET_SPARC) || defined(TARGET_PPC)
> cpu_reset(ENV_GET_CPU(env));
> #endif
> thread_env = env;
> diff --git a/exec.c b/exec.c
> index 8dfa458..8ac98f0 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -538,7 +538,7 @@ CPUArchState *cpu_copy(CPUArchState *env)
> #endif
>
> #ifdef CONFIG_USER_ONLY
> -#if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
> +#if defined(TARGET_SPARC) || defined(TARGET_PPC)
> cpu_reset(ENV_GET_CPU(new_env));
> #endif
> #endif
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 0181bc2..3df8aa2 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -3540,7 +3540,7 @@ int main(int argc, char **argv, char **envp)
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> }
> -#if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
> +#if defined(TARGET_SPARC) || defined(TARGET_PPC)
> cpu_reset(ENV_GET_CPU(env));
> #endif
>
Reviewed-By: Igor Mammedov <address@hidden>