From patchwork Wed Jan 17 15:43:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 862332 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 3zMBWd1XQxz9s75 for ; Thu, 18 Jan 2018 02:55:41 +1100 (AEDT) Received: from localhost ([::1]:44216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebq3v-0004Cu-6D for incoming@patchwork.ozlabs.org; Wed, 17 Jan 2018 10:55:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebpuK-0005BZ-8S for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebpuH-0008EM-5Q for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebpuG-0008Cj-Vb; Wed, 17 Jan 2018 10:45:41 -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 E78FF400E7; Wed, 17 Jan 2018 15:45:39 +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 36AAD4AB; Wed, 17 Jan 2018 15:45:35 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 17 Jan 2018 16:43:23 +0100 Message-Id: <1516203816-19374-12-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.25]); Wed, 17 Jan 2018 15:45:40 +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 11/24] ppc: 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: Alexander Graf , Riku Voipio , qemu-ppc@nongnu.org, Laurent Vivier , David Gibson 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 values from linux-user for TARGET_DEFAULT_CPU_TYPE. While at it fixup linux-user to use corresponding cpu models instead of aliases. Signed-off-by: Igor Mammedov Acked-by: David Gibson --- CC: Riku Voipio CC: Laurent Vivier CC: David Gibson CC: Alexander Graf CC: qemu-ppc@nongnu.org --- target/ppc/cpu.h | 6 ++++++ linux-user/main.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index a5e49f2..4af4aff 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1377,6 +1377,12 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val); #define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX +#ifdef TARGET_PPC64 +#define TARGET_DEFAULT_CPU_TYPE POWERPC_CPU_TYPE_NAME("power8_v2.0") +#else +#define TARGET_DEFAULT_CPU_TYPE POWERPC_CPU_TYPE_NAME("750_v3.1") +#endif + #define cpu_signal_handler cpu_ppc_signal_handler #define cpu_list ppc_cpu_list diff --git a/linux-user/main.c b/linux-user/main.c index 54e8aac..279cd97 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4343,9 +4343,9 @@ int main(int argc, char **argv, char **envp) cpu_model = "or1200"; #elif defined(TARGET_PPC) # ifdef TARGET_PPC64 - cpu_model = "POWER8"; + cpu_model = "power8_v2.0"; # else - cpu_model = "750"; + cpu_model = "750_v3.1"; # endif #elif defined TARGET_SH4 cpu_model = "sh7785";