[Qemu-devel] [PATCH] target-arm: cpu: set default cpu_model via QEMUMachine.cpu_model

[Igor Mammedov]

Signed-off-by: Igor Mammedov <address@hidden>
---
 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