Set default max_cpus to one.

Clean-up machine definitions.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5566 c046a42c-6fe2-441c-8c8c-71466251a162

26 files changed, 13 insertions, 38 deletions

diff --git a/hw/an5206.c b/hw/an5206.c
index 862d0cf..2981263 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -92,5 +92,4 @@ QEMUMachine an5206_machine = {
     .desc = "Arnewsh 5206",
     .init = an5206_init,
     .ram_require = 512,
-    .max_cpus = 1,
 };
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index f7a80af..fc06e9c 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -66,5 +66,4 @@ QEMUMachine dummy_m68k_machine = {
     .name = "dummy",
     .desc = "Dummy board",
     .init = dummy_m68k_init,
-    .max_cpus = 1,
 };
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 0f18ce6..4f93cd8 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -157,5 +157,4 @@ QEMUMachine bareetraxfs_machine = {
     .desc = "Bare ETRAX FS board",
     .init = bareetraxfs_init,
     .ram_require = 0x8000000,
-    .max_cpus = 1,
 };
diff --git a/hw/gumstix.c b/hw/gumstix.c
index f184648..29cd69d 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -126,7 +126,6 @@ QEMUMachine connex_machine = {
     .desc = "Gumstix Connex (PXA255)",
     .init = connex_init,
     .ram_require = (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 QEMUMachine verdex_machine = {
@@ -134,5 +133,4 @@ QEMUMachine verdex_machine = {
     .desc = "Gumstix Verdex (PXA270)",
     .init = verdex_init,
     .ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 1ae5d2a..779d46b 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -544,5 +544,4 @@ QEMUMachine integratorcp_machine = {
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
     .ram_require = 0x100000,
-    .max_cpus = 1,
 };
diff --git a/hw/mainstone.c b/hw/mainstone.c
index f4feb4f..8923385 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -148,6 +148,5 @@ QEMUMachine mainstone2_machine = {
     .desc = "Mainstone II (PXA27x)",
     .init = mainstone_init,
     .ram_require = (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
-		    PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
+                    PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
 };
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index fe3566e..3e0a811 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -309,5 +309,4 @@ QEMUMachine mcf5208evb_machine = {
     .desc = "MCF5206EVB",
     .init = mcf5208evb_init,
     .ram_require = 16384,
-    .max_cpus = 1,
 };
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 68e63ff..b332a45 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -278,7 +278,6 @@ QEMUMachine mips_magnum_machine = {
     .init = mips_magnum_init,
     .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 1,
 };
 
 QEMUMachine mips_pica61_machine = {
@@ -287,5 +286,4 @@ QEMUMachine mips_pica61_machine = {
     .init = mips_pica61_init,
     .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 1,
 };
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index e1999d5..629e914 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -950,5 +950,4 @@ QEMUMachine mips_malta_machine = {
     .init = mips_malta_init,
     .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 1,
 };
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index bd5266a..dc62f69 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -196,5 +196,4 @@ QEMUMachine mips_mipssim_machine = {
     .init = mips_mipssim_init,
     .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
     .nodisk_ok = 1,
-    .max_cpus = 1,
 };
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 399f452..6551b02 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -287,5 +287,4 @@ QEMUMachine mips_machine = {
     .init = mips_r4k_init,
     .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 1,
 };
diff --git a/hw/musicpal.c b/hw/musicpal.c
index ffd59fa..c7c11de 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -1512,6 +1512,6 @@ QEMUMachine musicpal_machine = {
     .name = "musicpal",
     .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
     .init = musicpal_init,
-    .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED,
-    .max_cpus = 1,
+    .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE +
+            MP_FLASH_SIZE_MAX + RAMSIZE_FIXED,
 };
diff --git a/hw/nseries.c b/hw/nseries.c
index 3fd8099..80fd9e8 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1407,14 +1407,14 @@ QEMUMachine n800_machine = {
     .name = "n800",
     .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
     .init = n800_init,
-    .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
+    .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) |
+            RAMSIZE_FIXED,
 };
 
 QEMUMachine n810_machine = {
     .name = "n810",
     .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
     .init = n810_init,
-    .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
+    .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) |
+            RAMSIZE_FIXED,
 };
diff --git a/hw/palm.c b/hw/palm.c
index b45cdd6..9bc6eec 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -285,6 +285,6 @@ QEMUMachine palmte_machine = {
     .name = "cheetah",
     .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
     .init = palmte_init,
-    .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
+    .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) |
+            RAMSIZE_FIXED,
 };
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index a83f28e..c7a6959 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -359,7 +359,6 @@ QEMUMachine ref405ep_machine = {
     .desc = "ref405ep",
     .init = ref405ep_init,
     .ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 /*****************************************************************************/
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index ede2924..5bdb805 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -335,5 +335,5 @@ QEMUMachine core99_machine = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
-    .max_cpus = 1,
+    .max_cpus = MAX_CPUS,
 };
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 75faeb3..0265596 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -370,5 +370,5 @@ QEMUMachine heathrow_machine = {
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
-    .max_cpus = 1,
+    .max_cpus = MAX_CPUS,
 };
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 0180bbb..8b5f85c 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -764,5 +764,5 @@ QEMUMachine prep_machine = {
     .desc = "PowerPC PREP platform",
     .init = ppc_prep_init,
     .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
-    .max_cpus = 1,
+    .max_cpus = MAX_CPUS,
 };
diff --git a/hw/r2d.c b/hw/r2d.c
index 58c93e8..855aa41 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -168,5 +168,4 @@ QEMUMachine r2d_machine = {
     .desc = "r2d-plus board",
     .init = r2d_init,
     .ram_require = SDRAM_SIZE | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/realview.c b/hw/realview.c
index 14c001e..a9d20ed 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -202,5 +202,4 @@ QEMUMachine realview_machine = {
     .init = realview_init,
     .ram_require = 0x1000,
     .use_scsi = 1,
-    .max_cpus = 1,
 };
diff --git a/hw/shix.c b/hw/shix.c
index 3cc41fb..140efe9 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -112,5 +112,4 @@ QEMUMachine shix_machine = {
     .desc = "shix card",
     .init = shix_init,
     .ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/spitz.c b/hw/spitz.c
index 36b490d..fc77174 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -1014,7 +1014,6 @@ QEMUMachine akitapda_machine = {
     .desc = "Akita PDA (PXA270)",
     .init = akita_init,
     .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 QEMUMachine spitzpda_machine = {
@@ -1022,7 +1021,6 @@ QEMUMachine spitzpda_machine = {
     .desc = "Spitz PDA (PXA270)",
     .init = spitz_init,
     .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 QEMUMachine borzoipda_machine = {
@@ -1030,7 +1028,6 @@ QEMUMachine borzoipda_machine = {
     .desc = "Borzoi PDA (PXA270)",
     .init = borzoi_init,
     .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 QEMUMachine terrierpda_machine = {
@@ -1038,5 +1035,4 @@ QEMUMachine terrierpda_machine = {
     .desc = "Terrier PDA (PXA270)",
     .init = terrier_init,
     .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 4645bd6..5948079 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1417,7 +1417,6 @@ QEMUMachine lm3s811evb_machine = {
     .desc = "Stellaris LM3S811EVB",
     .init = lm3s811evb_init,
     .ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
 
 QEMUMachine lm3s6965evb_machine = {
@@ -1425,5 +1424,4 @@ QEMUMachine lm3s6965evb_machine = {
     .desc = "Stellaris LM3S6965EVB",
     .init = lm3s6965evb_init,
     .ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/tosa.c b/hw/tosa.c
index e7b2be3..75df52e 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -123,5 +123,4 @@ QEMUMachine tosapda_machine = {
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
     .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
-    .max_cpus = 1,
 };
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index c4c867d..f9e9988 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -320,7 +320,6 @@ QEMUMachine versatilepb_machine = {
     .desc = "ARM Versatile/PB (ARM926EJ-S)",
     .init = vpb_init,
     .use_scsi = 1,
-    .max_cpus = 1,
 };
 
 QEMUMachine versatileab_machine = {
@@ -328,5 +327,4 @@ QEMUMachine versatileab_machine = {
     .desc = "ARM Versatile/AB (ARM926EJ-S)",
     .init = vab_init,
     .use_scsi = 1,
-    .max_cpus = 1,
 };
diff --git a/vl.c b/vl.c
index 0ca7151..1afe36e 100644
--- a/vl.c
+++ b/vl.c
@@ -9407,6 +9407,7 @@ int main(int argc, char **argv)
         }
     }
 
+    machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */
     if (smp_cpus > machine->max_cpus) {
         fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
                 "supported by machine `%s' (%d)\n", smp_cpus,  machine->name,