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

diff --git a/hw/an5206.c b/hw/an5206.c
index 862d0cf7289fc527d4fbc02431cba880ab962b91..29812631e71700d8802b83ec39ee00d5f7820aef 100644 (file)
--- 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 f7a80afcf9a9df3acd3464cfc5536a5b120ff33e..fc06e9cc88f638d56b38ba92bdbe71eafea8616c 100644 (file)
--- 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 0f18ce670d78036faf1fcffe62b5302f0aeedd25..4f93cd81c3afce0c389a9b450ced300bf6772f49 100644 (file)
--- 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 f184648e5637f529b242003aa542fb6e25e3458a..29cd69df24fdd941aecd2795c5b8a413ccf08539 100644 (file)
--- 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 1ae5d2a8335745864cd5dbd61c976c1d47cbb4d5..779d46b70ed7422ce00958dfe9763141c492ab5c 100644 (file)
--- 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 f4feb4fe2ae92a01e7612b80c7d8c2ad67d5593d..8923385354d5e8338bbe907c3051adbe2f4996da 100644 (file)
--- 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 fe3566ee0f6b0e562cb9801debcd070e4a4d9647..3e0a8117519d2975c47960a34ab97adcaf200e1e 100644 (file)
--- 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 68e63ff436b5518cf340e2b029e84844679c5aff..b332a4598e2b2e4d499dbf450afc9b8ddde40cf1 100644 (file)
--- 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 e1999d52e6af56ed08ff9bdf2228f8d947f9f3f8..629e91470bc425b32fa2f475ca635aa4977a8a24 100644 (file)
--- 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 bd5266ad846a0df77d00b9b80f18d4ca3696f7ff..dc62f696a038fc4760ac4c8b1c3e553cd2c414f7 100644 (file)
--- 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 399f452a8d6f505833fd08ce6b28a0baa7b6ad06..6551b02e0bbac934fa96da2b8d69c3c946329dec 100644 (file)
--- 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 ffd59faf66d7398a32a1703e8c9ffce1bfecc9e9..c7c11dea49ac88182830eb4d0383bfc15f4e0467 100644 (file)
--- 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 3fd8099aae11c201fdd4612796a9ac40c6508496..80fd9e81df2bfe83083ee19d7d488660e2859ed8 100644 (file)
--- 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 b45cdd645251772cd50a03d59dacc7bcdee5a8ba..9bc6eec958aeb990c8817621d7cc97d7b1516cfd 100644 (file)
--- 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 a83f28e9b9b420bc3ce3cfbf4fe88fc0f0c16deb..c7a69596c7fc5372085c426ed7d22339e1c1bafd 100644 (file)
--- 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 ede2924ed76a2b1f869121b3d5b856b0d0c2fa12..5bdb80536b41ac0f5a116663606666e8d2cd6c3c 100644 (file)
--- 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 75faeb3c44249beb9f716d849d0ccad927cf577f..02655962fd2f89a8dca43648372b718af665afc9 100644 (file)
--- 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 0180bbb045dc3e32df1be34dc3b95c4cc431b36d..8b5f85cad8f0c815ad73fabd0478c14095560f42 100644 (file)
--- 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 58c93e89932f4b988808356b95fb0a696159e94e..855aa414ff50c5460a0da78e333bdce075132168 100644 (file)
--- 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 14c001ecdd9bac25ae5367ba77216039df32d081..a9d20edc525520656210432e8c3ce1f3508f8c75 100644 (file)
--- 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 3cc41fb830f3993ae6e599dcbe593f8bff9301dd..140efe90a5fe06a028204ae187e8cc9757c6b95d 100644 (file)
--- 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 36b490dce8518aa1e17cf6ae1587148a4e58acc8..fc7717460ea40a2fd096343315185c052e654b0c 100644 (file)
--- 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 4645bd6fb4ff098a6eed5cf5a8d410fa33d2cf81..5948079e171fe1bdb7a45f03dd382cd626cc363e 100644 (file)
--- 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 e7b2be31e45e6971db539fd7edf9195783cc95f6..75df52ec7d28941a29be7c17ab778d9f3f6e2675 100644 (file)
--- 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 c4c867d0f6d3052376596afff5afbe6bf1cb294d..f9e9988fc6a71ef784ac2270c5dc10c43ca6316b 100644 (file)
--- 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 0ca71519b5bc7262f0e8b00d832f251cf58dde79..1afe36e6e9d31962ebf176cb612175f09aa0783f 100644 (file)
--- 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,