| Message ID | CAAu8pHu5Mo=YMvCWjVRrmTKrgmmFppMyS6q0LLFqo0fOxrdj5Q@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On 19 April 2012 21:27, Blue Swirl <blauwirbel@gmail.com> wrote: > @@ -119,7 +120,9 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) > cpu = SPARC_CPU(object_new(TYPE_SPARC_CPU)); > env = &cpu->env; > > - gen_intermediate_code_init(env); > + if (!qtest_enabled()) { > + gen_intermediate_code_init(env); > + } gen_intermediate_code_init() is doing TCG specific init, so this guard should be "if (tcg_enabled())". -- PMM
On Thu, Apr 19, 2012 at 20:48, Peter Maydell <peter.maydell@linaro.org> wrote: > On 19 April 2012 21:27, Blue Swirl <blauwirbel@gmail.com> wrote: >> @@ -119,7 +120,9 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) >> cpu = SPARC_CPU(object_new(TYPE_SPARC_CPU)); >> env = &cpu->env; >> >> - gen_intermediate_code_init(env); >> + if (!qtest_enabled()) { >> + gen_intermediate_code_init(env); >> + } > > gen_intermediate_code_init() is doing TCG specific init, so > this guard should be "if (tcg_enabled())". OK. Though I wouldn't hold my breath waiting for KVM on Sparc. > > -- PMM
From 1e4369c89c599a73d688535a7b2350e9512cd073 Mon Sep 17 00:00:00 2001 Message-Id: <1e4369c89c599a73d688535a7b2350e9512cd073.1334866660.git.blauwirbel@gmail.com> In-Reply-To: <85215d419b17aeedbfe93ff8d739b27937f72739.1334866660.git.blauwirbel@gmail.com> References: <85215d419b17aeedbfe93ff8d739b27937f72739.1334866660.git.blauwirbel@gmail.com> From: Blue Swirl <blauwirbel@gmail.com> Date: Thu, 19 Apr 2012 18:33:05 +0000 Subject: [PATCH 3/4] sparc: fix qtest Skip TCG init for qtest. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- target-sparc/cpu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 24f90f1..6720837 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -17,6 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qtest.h" #include "cpu.h" //#define DEBUG_FEATURES @@ -119,7 +120,9 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) cpu = SPARC_CPU(object_new(TYPE_SPARC_CPU)); env = &cpu->env; - gen_intermediate_code_init(env); + if (!qtest_enabled()) { + gen_intermediate_code_init(env); + } if (cpu_sparc_register(env, cpu_model) < 0) { object_delete(OBJECT(cpu)); -- 1.7.2.5
Skip TCG init for qtest. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- target-sparc/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)