From patchwork Wed Aug 8 10:07:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 175888 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 BCCA42C0096 for ; Wed, 8 Aug 2012 20:07:58 +1000 (EST) Received: from localhost ([::1]:45879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz3BE-0003QM-Qi for incoming@patchwork.ozlabs.org; Wed, 08 Aug 2012 06:07:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz3B2-000317-6B for qemu-devel@nongnu.org; Wed, 08 Aug 2012 06:07:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sz3As-00022h-Ku for qemu-devel@nongnu.org; Wed, 08 Aug 2012 06:07:44 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:40711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sz3As-00022V-DZ for qemu-devel@nongnu.org; Wed, 08 Aug 2012 06:07:34 -0400 Received: by lbbgm13 with SMTP id gm13so336388lbb.4 for ; Wed, 08 Aug 2012 03:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=03TuzBb2dUp0UTb9g9C3I0KhLliB/0rNyDnSPXlfLD0=; b=P7hkUXrqfDLkQmfCSEO0Jb+rj8CmNBAY0zKTzZQ790fcsuE/0Pu0DjigTnzQcMF7I8 eIqzxIGWgNrHhWpbSVViKPS9GF+WSpTq472F/63Ff4clgHEMdEooWeBbyyYu9PDNVbXE Zy3kpveI7XiHP6I47XbLxcuDegFgQ6FyZRlVrQL5JsBBFjXCe22tJxUezGmCtN1/LTJs wNbJ1rXnSQzyjtbzX7haItqUhTxEgJtGQwV4y8B/MdTjPYsR5DcB+8LZgd+sW8Kj6itK 1NZaKlhr285fSRmoy5pzRxBBONyNg/2CIHqPYqSypEA3FDZgRHXmmqyYhbeflOL8RBBx H4aA== Received: by 10.112.36.130 with SMTP id q2mr7376064lbj.44.1344420453309; Wed, 08 Aug 2012 03:07:33 -0700 (PDT) Received: from grizzly.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id lx11sm14062451lab.4.2012.08.08.03.07.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Aug 2012 03:07:32 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2012 14:07:14 +0400 Message-Id: <1344420434-18294-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.217.173 Cc: Max Filippov , Markus Armbruster Subject: [Qemu-devel] [PATCH] target-xtensa: make default CPU depend on target endianness 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 This makes usable default for -cpu option both for qemu-system-xtensa and qemu-system-xtensaeb fixing the following error: $ qemu-system-xtensaeb -M sim Unable to find CPU definition Signed-off-by: Max Filippov Tested-by: Markus Armbruster --- hw/xtensa_lx60.c | 6 +++--- hw/xtensa_sim.c | 4 ++-- target-xtensa/cpu.h | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 152eed9..26a0c75 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -173,7 +173,7 @@ static void lx_init(const LxBoardDesc *board, int n; if (!cpu_model) { - cpu_model = "dc232b"; + cpu_model = XTENSA_DEFAULT_CPU_MODEL; } for (n = 0; n < smp_cpus; n++) { @@ -300,14 +300,14 @@ static void xtensa_lx200_init(ram_addr_t ram_size, static QEMUMachine xtensa_lx60_machine = { .name = "lx60", - .desc = "lx60 EVB (dc232b)", + .desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", .init = xtensa_lx60_init, .max_cpus = 4, }; static QEMUMachine xtensa_lx200_machine = { .name = "lx200", - .desc = "lx200 EVB (dc232b)", + .desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", .init = xtensa_lx200_init, .max_cpus = 4, }; diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index 1ce07fb..ed38bd4 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -102,7 +102,7 @@ static void xtensa_sim_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { if (!cpu_model) { - cpu_model = "dc232b"; + cpu_model = XTENSA_DEFAULT_CPU_MODEL; } sim_init(ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model); @@ -110,7 +110,7 @@ static void xtensa_sim_init(ram_addr_t ram_size, static QEMUMachine xtensa_sim_machine = { .name = "sim", - .desc = "sim machine (dc232b)", + .desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")", .init = xtensa_sim_init, .max_cpus = 4, }; diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index f7db116..177094a 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -351,6 +351,12 @@ typedef struct CPUXtensaState { #define cpu_signal_handler cpu_xtensa_signal_handler #define cpu_list xtensa_cpu_list +#ifdef TARGET_WORDS_BIGENDIAN +#define XTENSA_DEFAULT_CPU_MODEL "fsf" +#else +#define XTENSA_DEFAULT_CPU_MODEL "dc232b" +#endif + XtensaCPU *cpu_xtensa_init(const char *cpu_model); static inline CPUXtensaState *cpu_init(const char *cpu_model)