From patchwork Tue Apr 30 14:48:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 240633 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 01E352C00D0 for ; Wed, 1 May 2013 00:52:21 +1000 (EST) Received: from localhost ([::1]:45606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBul-0006Dg-1h for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2013 10:52:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBtm-0005Bn-FX for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXBtl-0002Na-1H for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:51:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBtk-0002NP-PQ for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:51:16 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3UEpGbg007866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 30 Apr 2013 10:51:16 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3UEpEwJ026629; Tue, 30 Apr 2013 10:51:15 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 30 Apr 2013 16:48:37 +0200 Message-Id: <1367333317-31468-1-git-send-email-imammedo@redhat.com> In-Reply-To: <20130430143043.GE28606@otherpad.lan.raisama.net> References: <20130430143043.GE28606@otherpad.lan.raisama.net> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH] target-arm: cpu: set default cpu_model via QEMUMachine.cpu_model 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 Signed-off-by: Igor Mammedov --- compile tested only ... --- hw/arm/realview.c | 16 ++++------------ hw/arm/versatilepb.c | 5 ++--- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index d6f47bf..5327b66 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -334,33 +334,21 @@ static void realview_init(QEMUMachineInitArgs *args, static void realview_eb_init(QEMUMachineInitArgs *args) { - if (!args->cpu_model) { - args->cpu_model = "arm926"; - } realview_init(args, BOARD_EB); } static void realview_eb_mpcore_init(QEMUMachineInitArgs *args) { - if (!args->cpu_model) { - args->cpu_model = "arm11mpcore"; - } realview_init(args, BOARD_EB_MPCORE); } static void realview_pb_a8_init(QEMUMachineInitArgs *args) { - if (!args->cpu_model) { - args->cpu_model = "cortex-a8"; - } realview_init(args, BOARD_PB_A8); } static void realview_pbx_a9_init(QEMUMachineInitArgs *args) { - if (!args->cpu_model) { - args->cpu_model = "cortex-a9"; - } realview_init(args, BOARD_PBX_A9); } @@ -369,6 +357,7 @@ static QEMUMachine realview_eb_machine = { .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)", .init = realview_eb_init, .block_default_type = IF_SCSI, + .cpu_model = "arm926", DEFAULT_MACHINE_OPTIONS, }; @@ -378,6 +367,7 @@ static QEMUMachine realview_eb_mpcore_machine = { .init = realview_eb_mpcore_init, .block_default_type = IF_SCSI, .max_cpus = 4, + .cpu_model = "arm11mpcore", DEFAULT_MACHINE_OPTIONS, }; @@ -385,6 +375,7 @@ static QEMUMachine realview_pb_a8_machine = { .name = "realview-pb-a8", .desc = "ARM RealView Platform Baseboard for Cortex-A8", .init = realview_pb_a8_init, + .cpu_model = "cortex-a8", DEFAULT_MACHINE_OPTIONS, }; @@ -394,6 +385,7 @@ static QEMUMachine realview_pbx_a9_machine = { .init = realview_pbx_a9_init, .block_default_type = IF_SCSI, .max_cpus = 4, + .cpu_model = "cortex-a9", DEFAULT_MACHINE_OPTIONS, }; diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 753757e..b7d0d24 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -185,9 +185,6 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) int done_smc = 0; DriveInfo *dinfo; - if (!args->cpu_model) { - args->cpu_model = "arm926"; - } cpu = cpu_arm_init(args->cpu_model); if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); @@ -362,6 +359,7 @@ static QEMUMachine versatilepb_machine = { .desc = "ARM Versatile/PB (ARM926EJ-S)", .init = vpb_init, .block_default_type = IF_SCSI, + .cpu_model = "arm926", DEFAULT_MACHINE_OPTIONS, }; @@ -370,6 +368,7 @@ static QEMUMachine versatileab_machine = { .desc = "ARM Versatile/AB (ARM926EJ-S)", .init = vab_init, .block_default_type = IF_SCSI, + .cpu_model = "arm926", DEFAULT_MACHINE_OPTIONS, };