[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/11] target-alpha: Make cpu_alpha_init() reentrant
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 11/11] target-alpha: Make cpu_alpha_init() reentrant |
Date: |
Fri, 21 Sep 2012 16:38:35 +0200 |
From: Richard Henderson <address@hidden>
Guard against duplicate TCG initialization, triggered by linux-user
NPTL emulation.
Signed-off-by: Richard Henderson <address@hidden>
[AF: Split off into separate patch]
Signed-off-by: Andreas Färber <address@hidden>
---
target-alpha/translate.c | 6 +++++-
1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 93063fb..f998f75 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -3525,6 +3525,7 @@ static const struct cpu_def_t cpu_defs[] = {
CPUAlphaState * cpu_alpha_init (const char *cpu_model)
{
+ static bool inited;
AlphaCPU *cpu;
CPUAlphaState *env;
int implver, amask, i, max;
@@ -3532,7 +3533,10 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model)
cpu = ALPHA_CPU(object_new(TYPE_ALPHA_CPU));
env = &cpu->env;
- alpha_translate_init();
+ if (!inited) {
+ inited = true;
+ alpha_translate_init();
+ }
/* Default to ev67; no reason not to emulate insns by default. */
implver = IMPLVER_21264;
--
1.7.10.4
- [Qemu-devel] [PULL] QOM CPUState patch queue 2012-09-21, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 02/11] target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 03/11] Drop cpu_list_id macro, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 05/11] target-i386: Move CPU models from cpus-x86_64.conf to C, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 04/11] target-i386: Add missing CPUID_* constants, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 10/11] target-alpha: Initialize env->cpu_model_str, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 06/11] Eliminate cpus-x86_64.conf file, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 11/11] target-alpha: Make cpu_alpha_init() reentrant,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/11] target-i386: Kill cpudef config section support, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 09/11] target-i386: Drop unused setscalar() macro, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 01/11] MAINTAINERS: Add entry for QOM CPU, Andreas Färber, 2012/09/21
- [Qemu-devel] [PATCH 07/11] target-i386: x86_cpudef_setup() coding style change, Andreas Färber, 2012/09/21
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-09-21, Anthony Liguori, 2012/09/21
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-09-21, Andreas Färber, 2012/09/21
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-09-21, Anthony Liguori, 2012/09/25