[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5566] Set default max_cpus to one.
From: |
Andrzej Zaborowski |
Subject: |
[Qemu-devel] [5566] Set default max_cpus to one. |
Date: |
Tue, 28 Oct 2008 10:59:59 +0000 |
Revision: 5566
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5566
Author: balrog
Date: 2008-10-28 10:59:59 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Set default max_cpus to one.
Clean-up machine definitions.
Modified Paths:
--------------
trunk/hw/an5206.c
trunk/hw/dummy_m68k.c
trunk/hw/etraxfs.c
trunk/hw/gumstix.c
trunk/hw/integratorcp.c
trunk/hw/mainstone.c
trunk/hw/mcf5208.c
trunk/hw/mips_jazz.c
trunk/hw/mips_malta.c
trunk/hw/mips_mipssim.c
trunk/hw/mips_r4k.c
trunk/hw/musicpal.c
trunk/hw/nseries.c
trunk/hw/palm.c
trunk/hw/ppc405_boards.c
trunk/hw/ppc_chrp.c
trunk/hw/ppc_oldworld.c
trunk/hw/ppc_prep.c
trunk/hw/r2d.c
trunk/hw/realview.c
trunk/hw/shix.c
trunk/hw/spitz.c
trunk/hw/stellaris.c
trunk/hw/tosa.c
trunk/hw/versatilepb.c
trunk/vl.c
Modified: trunk/hw/an5206.c
===================================================================
--- trunk/hw/an5206.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/an5206.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -92,5 +92,4 @@
.desc = "Arnewsh 5206",
.init = an5206_init,
.ram_require = 512,
- .max_cpus = 1,
};
Modified: trunk/hw/dummy_m68k.c
===================================================================
--- trunk/hw/dummy_m68k.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/dummy_m68k.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -66,5 +66,4 @@
.name = "dummy",
.desc = "Dummy board",
.init = dummy_m68k_init,
- .max_cpus = 1,
};
Modified: trunk/hw/etraxfs.c
===================================================================
--- trunk/hw/etraxfs.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/etraxfs.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -157,5 +157,4 @@
.desc = "Bare ETRAX FS board",
.init = bareetraxfs_init,
.ram_require = 0x8000000,
- .max_cpus = 1,
};
Modified: trunk/hw/gumstix.c
===================================================================
--- trunk/hw/gumstix.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/gumstix.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -126,7 +126,6 @@
.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 @@
.desc = "Gumstix Verdex (PXA270)",
.init = verdex_init,
.ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/integratorcp.c
===================================================================
--- trunk/hw/integratorcp.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/integratorcp.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -544,5 +544,4 @@
.desc = "ARM Integrator/CP (ARM926EJ-S)",
.init = integratorcp_init,
.ram_require = 0x100000,
- .max_cpus = 1,
};
Modified: trunk/hw/mainstone.c
===================================================================
--- trunk/hw/mainstone.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mainstone.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -148,6 +148,5 @@
.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,
};
Modified: trunk/hw/mcf5208.c
===================================================================
--- trunk/hw/mcf5208.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mcf5208.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -309,5 +309,4 @@
.desc = "MCF5206EVB",
.init = mcf5208evb_init,
.ram_require = 16384,
- .max_cpus = 1,
};
Modified: trunk/hw/mips_jazz.c
===================================================================
--- trunk/hw/mips_jazz.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mips_jazz.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -278,7 +278,6 @@
.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 @@
.init = mips_pica61_init,
.ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
.nodisk_ok = 1,
- .max_cpus = 1,
};
Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mips_malta.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -950,5 +950,4 @@
.init = mips_malta_init,
.ram_require = VGA_RAM_SIZE + BIOS_SIZE,
.nodisk_ok = 1,
- .max_cpus = 1,
};
Modified: trunk/hw/mips_mipssim.c
===================================================================
--- trunk/hw/mips_mipssim.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mips_mipssim.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -196,5 +196,4 @@
.init = mips_mipssim_init,
.ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
.nodisk_ok = 1,
- .max_cpus = 1,
};
Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/mips_r4k.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -287,5 +287,4 @@
.init = mips_r4k_init,
.ram_require = VGA_RAM_SIZE + BIOS_SIZE,
.nodisk_ok = 1,
- .max_cpus = 1,
};
Modified: trunk/hw/musicpal.c
===================================================================
--- trunk/hw/musicpal.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/musicpal.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -1512,6 +1512,6 @@
.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,
};
Modified: trunk/hw/nseries.c
===================================================================
--- trunk/hw/nseries.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/nseries.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -1407,14 +1407,14 @@
.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,
};
Modified: trunk/hw/palm.c
===================================================================
--- trunk/hw/palm.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/palm.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -285,6 +285,6 @@
.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,
};
Modified: trunk/hw/ppc405_boards.c
===================================================================
--- trunk/hw/ppc405_boards.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/ppc405_boards.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -359,7 +359,6 @@
.desc = "ref405ep",
.init = ref405ep_init,
.ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) |
RAMSIZE_FIXED,
- .max_cpus = 1,
};
/*****************************************************************************/
Modified: trunk/hw/ppc_chrp.c
===================================================================
--- trunk/hw/ppc_chrp.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/ppc_chrp.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -335,5 +335,5 @@
.desc = "Mac99 based PowerMAC",
.init = ppc_core99_init,
.ram_require = BIOS_SIZE + VGA_RAM_SIZE,
- .max_cpus = 1,
+ .max_cpus = MAX_CPUS,
};
Modified: trunk/hw/ppc_oldworld.c
===================================================================
--- trunk/hw/ppc_oldworld.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/ppc_oldworld.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -370,5 +370,5 @@
.desc = "Heathrow based PowerMAC",
.init = ppc_heathrow_init,
.ram_require = BIOS_SIZE + VGA_RAM_SIZE,
- .max_cpus = 1,
+ .max_cpus = MAX_CPUS,
};
Modified: trunk/hw/ppc_prep.c
===================================================================
--- trunk/hw/ppc_prep.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/ppc_prep.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -764,5 +764,5 @@
.desc = "PowerPC PREP platform",
.init = ppc_prep_init,
.ram_require = BIOS_SIZE + VGA_RAM_SIZE,
- .max_cpus = 1,
+ .max_cpus = MAX_CPUS,
};
Modified: trunk/hw/r2d.c
===================================================================
--- trunk/hw/r2d.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/r2d.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -168,5 +168,4 @@
.desc = "r2d-plus board",
.init = r2d_init,
.ram_require = SDRAM_SIZE | RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/realview.c
===================================================================
--- trunk/hw/realview.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/realview.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -202,5 +202,4 @@
.init = realview_init,
.ram_require = 0x1000,
.use_scsi = 1,
- .max_cpus = 1,
};
Modified: trunk/hw/shix.c
===================================================================
--- trunk/hw/shix.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/shix.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -112,5 +112,4 @@
.desc = "shix card",
.init = shix_init,
.ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/spitz.c
===================================================================
--- trunk/hw/spitz.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/spitz.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -1014,7 +1014,6 @@
.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 @@
.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 @@
.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 @@
.desc = "Terrier PDA (PXA270)",
.init = terrier_init,
.ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE +
RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/stellaris.c
===================================================================
--- trunk/hw/stellaris.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/stellaris.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -1417,7 +1417,6 @@
.desc = "Stellaris LM3S811EVB",
.init = lm3s811evb_init,
.ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
- .max_cpus = 1,
};
QEMUMachine lm3s6965evb_machine = {
@@ -1425,5 +1424,4 @@
.desc = "Stellaris LM3S6965EVB",
.init = lm3s6965evb_init,
.ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/tosa.c
===================================================================
--- trunk/hw/tosa.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/tosa.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -123,5 +123,4 @@
.desc = "Tosa PDA (PXA255)",
.init = tosa_init,
.ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
- .max_cpus = 1,
};
Modified: trunk/hw/versatilepb.c
===================================================================
--- trunk/hw/versatilepb.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/hw/versatilepb.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -320,7 +320,6 @@
.desc = "ARM Versatile/PB (ARM926EJ-S)",
.init = vpb_init,
.use_scsi = 1,
- .max_cpus = 1,
};
QEMUMachine versatileab_machine = {
@@ -328,5 +327,4 @@
.desc = "ARM Versatile/AB (ARM926EJ-S)",
.init = vab_init,
.use_scsi = 1,
- .max_cpus = 1,
};
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2008-10-28 10:39:39 UTC (rev 5565)
+++ trunk/vl.c 2008-10-28 10:59:59 UTC (rev 5566)
@@ -9407,6 +9407,7 @@
}
}
+ 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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5566] Set default max_cpus to one.,
Andrzej Zaborowski <=