From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Igor Mammedov 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> Subject: [Qemu-devel] [PATCH] target-arm: cpu: set default cpu_model via QEMUMachine.cpu_model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de, ehabkost@redhat.com 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, }; -- 1.7.1