[Qemu-devel] [5604] More realistic max_cpus

[Blue Swirl]

Revision: 5604
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5604
Author:   blueswir1
Date:     2008-11-02 16:51:02 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
More realistic max_cpus

Modified Paths:
--------------
    trunk/hw/sun4m.c
    trunk/hw/sun4u.c

Modified: trunk/hw/sun4m.c
===================================================================
--- trunk/hw/sun4m.c    2008-11-02 14:44:35 UTC (rev 5603)
+++ trunk/hw/sun4m.c    2008-11-02 16:51:02 UTC (rev 5604)
@@ -1100,7 +1100,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 QEMUMachine ss10_machine = {
@@ -1110,7 +1109,7 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
+    .max_cpus = 4,
 };
 
 QEMUMachine ss600mp_machine = {
@@ -1120,7 +1119,7 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
+    .max_cpus = 4,
 };
 
 QEMUMachine ss20_machine = {
@@ -1130,7 +1129,7 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
+    .max_cpus = 4,
 };
 
 QEMUMachine voyager_machine = {
@@ -1140,7 +1139,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 QEMUMachine ss_lx_machine = {
@@ -1150,7 +1148,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 QEMUMachine ss4_machine = {
@@ -1160,7 +1157,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 QEMUMachine scls_machine = {
@@ -1170,7 +1166,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 QEMUMachine sbook_machine = {
@@ -1180,7 +1175,6 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 
 static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1429,7 +1423,7 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
+    .max_cpus = 8,
 };
 
 QEMUMachine ss2000_machine = {
@@ -1439,7 +1433,7 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
+    .max_cpus = 20,
 };
 
 static const struct sun4c_hwdef sun4c_hwdefs[] = {
@@ -1643,6 +1637,5 @@
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
     .nodisk_ok = 1,
     .use_scsi = 1,
-    .max_cpus = 16,
 };
 

Modified: trunk/hw/sun4u.c
===================================================================
--- trunk/hw/sun4u.c    2008-11-02 14:44:35 UTC (rev 5603)
+++ trunk/hw/sun4u.c    2008-11-02 16:51:02 UTC (rev 5604)
@@ -588,7 +588,7 @@
     .init = sun4u_init,
     .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 16,
+    .max_cpus = 1, // XXX for now
 };
 
 QEMUMachine sun4v_machine = {
@@ -597,7 +597,7 @@
     .init = sun4v_init,
     .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 16,
+    .max_cpus = 1, // XXX for now
 };
 
 QEMUMachine niagara_machine = {
@@ -606,5 +606,5 @@
     .init = niagara_init,
     .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
     .nodisk_ok = 1,
-    .max_cpus = 16,
+    .max_cpus = 1, // XXX for now
 };