From patchwork Wed Jan 17 15:43:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 862333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zMBWp2hhLz9s75 for ; Thu, 18 Jan 2018 02:55:50 +1100 (AEDT) Received: from localhost ([::1]:44226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebq44-0004Lf-E0 for incoming@patchwork.ozlabs.org; Wed, 17 Jan 2018 10:55:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebpuV-0005Pb-AJ for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebpuT-00006M-M8 for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebpuT-00005h-G1 for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55B487EA81; Wed, 17 Jan 2018 15:45:47 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 757DB4BA; Wed, 17 Jan 2018 15:45:45 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 17 Jan 2018 16:43:28 +0100 Message-Id: <1516203816-19374-17-git-send-email-imammedo@redhat.com> In-Reply-To: <1516203816-19374-1-git-send-email-imammedo@redhat.com> References: <1516203816-19374-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 17 Jan 2018 15:45:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 16/24] unicore32: cpu: add TARGET_DEFAULT_CPU_TYPE macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guan Xuetao , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" it will be used for for 2 purposes, 1st is to provide to cpu name resolving class for machine 'none' cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_model) and later to drop a bunch of ifdefs *-user/main.c that set default cpu_model. Use default value from linux-user for TARGET_DEFAULT_CPU_TYPE. While at it drop redundant ifdef and let catch all #else set default to the same 'any' model. Signed-off-by: Igor Mammedov --- CC: Riku Voipio CC: Laurent Vivier CC: Guan Xuetao --- target/unicore32/cpu.h | 1 + linux-user/main.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h index 3dc6fbc..fd3fa81 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -169,6 +169,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch) #define UNICORE32_CPU_TYPE_SUFFIX "-" TYPE_UNICORE32_CPU #define UNICORE32_CPU_TYPE_NAME(model) model UNICORE32_CPU_TYPE_SUFFIX +#define TARGET_DEFAULT_CPU_TYPE UNICORE32_CPU_TYPE_NAME("any") static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) diff --git a/linux-user/main.c b/linux-user/main.c index 279cd97..1cd5033 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4325,8 +4325,6 @@ int main(int argc, char **argv, char **envp) #else cpu_model = "qemu32"; #endif -#elif defined(TARGET_UNICORE32) - cpu_model = "any"; #elif defined(TARGET_SPARC) #ifdef TARGET_SPARC64 cpu_model = "TI UltraSparc II";