From patchwork Thu Apr 19 20:27:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 153864 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AC1E2B6FF8 for ; Fri, 20 Apr 2012 06:28:02 +1000 (EST) Received: from localhost ([::1]:48922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKxxQ-0001Bf-FU for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 16:28:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKxxF-00014H-Lt for qemu-devel@nongnu.org; Thu, 19 Apr 2012 16:27:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKxxD-0000tM-7s for qemu-devel@nongnu.org; Thu, 19 Apr 2012 16:27:49 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:62717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKxxD-0000lP-1C for qemu-devel@nongnu.org; Thu, 19 Apr 2012 16:27:47 -0400 Received: by mail-iy0-f173.google.com with SMTP id j26so14400150iaf.4 for ; Thu, 19 Apr 2012 13:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=t1ThHPbEedLFIYGFwwBpOcQa1y6DzO8RbIy7iaOMuB8=; b=Rgd0u+eSp1clDszcsixEmaf50FovSdiWx0s1N+0zvPa8qnkAbLWqvtifbVpV9npnfk txcmkUpPZR4bVt16XG84wCASR4oV1OnCsWN9Qxv/rvjCC4RyHokQLb8Sssx4n4vPgCyJ z2aZLjHTgPAjAN5TF7H76Gb5LjdVTzCLilAqYumf4xWLpH6bRusj3FoYDuks4zauTCjV DjvuM3eHzATCG0Bfy75ackA4UWKPB1Vhd3jkjWqOtFo+eDWwHyezZMS31wv7ed5J3oox 2ZutbUVcvG/Y2gg++MjaEXslhelaBkjB4rchT0Dvbx2R+LC936ca64FChfYEdzUEtvMy eb+g== Received: by 10.42.203.148 with SMTP id fi20mr3029276icb.10.1334867266280; Thu, 19 Apr 2012 13:27:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.197.194 with HTTP; Thu, 19 Apr 2012 13:27:26 -0700 (PDT) From: Blue Swirl Date: Thu, 19 Apr 2012 20:27:26 +0000 Message-ID: To: Anthony Liguori , Paolo Bonzini , qemu-devel X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.173 Subject: [Qemu-devel] [PATCH 3/4] sparc: fix qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Skip TCG init for qtest. Signed-off-by: Blue Swirl --- target-sparc/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 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 --- 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 . */ +#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