gwj / at91sam9263 · Commits

Commit 1bcee01487fc1bc3c43cd444c864c97a7a2d99f9

Authored by blueswir1
1 parent a7227727

More realistic max_cpus 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5604 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 8 additions and 15 deletions
hw/sun4m.c
  View file @1bcee01
... ... @@ -1100,7 +1100,6 @@ QEMUMachine ss5_machine = {
1100 1100 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1101 1101 .nodisk_ok = 1,
1102 1102 .use_scsi = 1,
1103   - .max_cpus = 16,
1104 1103 };
1105 1104  
1106 1105 QEMUMachine ss10_machine = {
... ... @@ -1110,7 +1109,7 @@ QEMUMachine ss10_machine = {
1110 1109 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1111 1110 .nodisk_ok = 1,
1112 1111 .use_scsi = 1,
1113   - .max_cpus = 16,
  1112 + .max_cpus = 4,
1114 1113 };
1115 1114  
1116 1115 QEMUMachine ss600mp_machine = {
... ... @@ -1120,7 +1119,7 @@ QEMUMachine ss600mp_machine = {
1120 1119 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1121 1120 .nodisk_ok = 1,
1122 1121 .use_scsi = 1,
1123   - .max_cpus = 16,
  1122 + .max_cpus = 4,
1124 1123 };
1125 1124  
1126 1125 QEMUMachine ss20_machine = {
... ... @@ -1130,7 +1129,7 @@ QEMUMachine ss20_machine = {
1130 1129 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1131 1130 .nodisk_ok = 1,
1132 1131 .use_scsi = 1,
1133   - .max_cpus = 16,
  1132 + .max_cpus = 4,
1134 1133 };
1135 1134  
1136 1135 QEMUMachine voyager_machine = {
... ... @@ -1140,7 +1139,6 @@ QEMUMachine voyager_machine = {
1140 1139 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1141 1140 .nodisk_ok = 1,
1142 1141 .use_scsi = 1,
1143   - .max_cpus = 16,
1144 1142 };
1145 1143  
1146 1144 QEMUMachine ss_lx_machine = {
... ... @@ -1150,7 +1148,6 @@ QEMUMachine ss_lx_machine = {
1150 1148 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1151 1149 .nodisk_ok = 1,
1152 1150 .use_scsi = 1,
1153   - .max_cpus = 16,
1154 1151 };
1155 1152  
1156 1153 QEMUMachine ss4_machine = {
... ... @@ -1160,7 +1157,6 @@ QEMUMachine ss4_machine = {
1160 1157 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1161 1158 .nodisk_ok = 1,
1162 1159 .use_scsi = 1,
1163   - .max_cpus = 16,
1164 1160 };
1165 1161  
1166 1162 QEMUMachine scls_machine = {
... ... @@ -1170,7 +1166,6 @@ QEMUMachine scls_machine = {
1170 1166 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1171 1167 .nodisk_ok = 1,
1172 1168 .use_scsi = 1,
1173   - .max_cpus = 16,
1174 1169 };
1175 1170  
1176 1171 QEMUMachine sbook_machine = {
... ... @@ -1180,7 +1175,6 @@ QEMUMachine sbook_machine = {
1180 1175 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1181 1176 .nodisk_ok = 1,
1182 1177 .use_scsi = 1,
1183   - .max_cpus = 16,
1184 1178 };
1185 1179  
1186 1180 static const struct sun4d_hwdef sun4d_hwdefs[] = {
... ... @@ -1429,7 +1423,7 @@ QEMUMachine ss1000_machine = {
1429 1423 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1430 1424 .nodisk_ok = 1,
1431 1425 .use_scsi = 1,
1432   - .max_cpus = 16,
  1426 + .max_cpus = 8,
1433 1427 };
1434 1428  
1435 1429 QEMUMachine ss2000_machine = {
... ... @@ -1439,7 +1433,7 @@ QEMUMachine ss2000_machine = {
1439 1433 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1440 1434 .nodisk_ok = 1,
1441 1435 .use_scsi = 1,
1442   - .max_cpus = 16,
  1436 + .max_cpus = 20,
1443 1437 };
1444 1438  
1445 1439 static const struct sun4c_hwdef sun4c_hwdefs[] = {
... ... @@ -1643,6 +1637,5 @@ QEMUMachine ss2_machine = {
1643 1637 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1644 1638 .nodisk_ok = 1,
1645 1639 .use_scsi = 1,
1646   - .max_cpus = 16,
1647 1640 };
1648 1641  
... ...
hw/sun4u.c
  View file @1bcee01
... ... @@ -588,7 +588,7 @@ QEMUMachine sun4u_machine = {
588 588 .init = sun4u_init,
589 589 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
590 590 .nodisk_ok = 1,
591   - .max_cpus = 16,
  591 + .max_cpus = 1, // XXX for now
592 592 };
593 593  
594 594 QEMUMachine sun4v_machine = {
... ... @@ -597,7 +597,7 @@ QEMUMachine sun4v_machine = {
597 597 .init = sun4v_init,
598 598 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
599 599 .nodisk_ok = 1,
600   - .max_cpus = 16,
  600 + .max_cpus = 1, // XXX for now
601 601 };
602 602  
603 603 QEMUMachine niagara_machine = {
... ... @@ -606,5 +606,5 @@ QEMUMachine niagara_machine = {
606 606 .init = niagara_init,
607 607 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
608 608 .nodisk_ok = 1,
609   - .max_cpus = 16,
  609 + .max_cpus = 1, // XXX for now
610 610 };
... ...