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,7 +1100,6 @@ QEMUMachine ss5_machine = {
1100 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1100 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1101 .nodisk_ok = 1, 1101 .nodisk_ok = 1,
1102 .use_scsi = 1, 1102 .use_scsi = 1,
1103 - .max_cpus = 16,  
1104 }; 1103 };
1105 1104
1106 QEMUMachine ss10_machine = { 1105 QEMUMachine ss10_machine = {
@@ -1110,7 +1109,7 @@ QEMUMachine ss10_machine = { @@ -1110,7 +1109,7 @@ QEMUMachine ss10_machine = {
1110 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1109 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1111 .nodisk_ok = 1, 1110 .nodisk_ok = 1,
1112 .use_scsi = 1, 1111 .use_scsi = 1,
1113 - .max_cpus = 16, 1112 + .max_cpus = 4,
1114 }; 1113 };
1115 1114
1116 QEMUMachine ss600mp_machine = { 1115 QEMUMachine ss600mp_machine = {
@@ -1120,7 +1119,7 @@ QEMUMachine ss600mp_machine = { @@ -1120,7 +1119,7 @@ QEMUMachine ss600mp_machine = {
1120 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1119 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1121 .nodisk_ok = 1, 1120 .nodisk_ok = 1,
1122 .use_scsi = 1, 1121 .use_scsi = 1,
1123 - .max_cpus = 16, 1122 + .max_cpus = 4,
1124 }; 1123 };
1125 1124
1126 QEMUMachine ss20_machine = { 1125 QEMUMachine ss20_machine = {
@@ -1130,7 +1129,7 @@ QEMUMachine ss20_machine = { @@ -1130,7 +1129,7 @@ QEMUMachine ss20_machine = {
1130 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1129 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1131 .nodisk_ok = 1, 1130 .nodisk_ok = 1,
1132 .use_scsi = 1, 1131 .use_scsi = 1,
1133 - .max_cpus = 16, 1132 + .max_cpus = 4,
1134 }; 1133 };
1135 1134
1136 QEMUMachine voyager_machine = { 1135 QEMUMachine voyager_machine = {
@@ -1140,7 +1139,6 @@ QEMUMachine voyager_machine = { @@ -1140,7 +1139,6 @@ QEMUMachine voyager_machine = {
1140 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1139 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1141 .nodisk_ok = 1, 1140 .nodisk_ok = 1,
1142 .use_scsi = 1, 1141 .use_scsi = 1,
1143 - .max_cpus = 16,  
1144 }; 1142 };
1145 1143
1146 QEMUMachine ss_lx_machine = { 1144 QEMUMachine ss_lx_machine = {
@@ -1150,7 +1148,6 @@ QEMUMachine ss_lx_machine = { @@ -1150,7 +1148,6 @@ QEMUMachine ss_lx_machine = {
1150 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1148 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1151 .nodisk_ok = 1, 1149 .nodisk_ok = 1,
1152 .use_scsi = 1, 1150 .use_scsi = 1,
1153 - .max_cpus = 16,  
1154 }; 1151 };
1155 1152
1156 QEMUMachine ss4_machine = { 1153 QEMUMachine ss4_machine = {
@@ -1160,7 +1157,6 @@ QEMUMachine ss4_machine = { @@ -1160,7 +1157,6 @@ QEMUMachine ss4_machine = {
1160 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1157 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1161 .nodisk_ok = 1, 1158 .nodisk_ok = 1,
1162 .use_scsi = 1, 1159 .use_scsi = 1,
1163 - .max_cpus = 16,  
1164 }; 1160 };
1165 1161
1166 QEMUMachine scls_machine = { 1162 QEMUMachine scls_machine = {
@@ -1170,7 +1166,6 @@ QEMUMachine scls_machine = { @@ -1170,7 +1166,6 @@ QEMUMachine scls_machine = {
1170 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1166 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1171 .nodisk_ok = 1, 1167 .nodisk_ok = 1,
1172 .use_scsi = 1, 1168 .use_scsi = 1,
1173 - .max_cpus = 16,  
1174 }; 1169 };
1175 1170
1176 QEMUMachine sbook_machine = { 1171 QEMUMachine sbook_machine = {
@@ -1180,7 +1175,6 @@ QEMUMachine sbook_machine = { @@ -1180,7 +1175,6 @@ QEMUMachine sbook_machine = {
1180 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1175 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1181 .nodisk_ok = 1, 1176 .nodisk_ok = 1,
1182 .use_scsi = 1, 1177 .use_scsi = 1,
1183 - .max_cpus = 16,  
1184 }; 1178 };
1185 1179
1186 static const struct sun4d_hwdef sun4d_hwdefs[] = { 1180 static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1429,7 +1423,7 @@ QEMUMachine ss1000_machine = { @@ -1429,7 +1423,7 @@ QEMUMachine ss1000_machine = {
1429 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1423 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1430 .nodisk_ok = 1, 1424 .nodisk_ok = 1,
1431 .use_scsi = 1, 1425 .use_scsi = 1,
1432 - .max_cpus = 16, 1426 + .max_cpus = 8,
1433 }; 1427 };
1434 1428
1435 QEMUMachine ss2000_machine = { 1429 QEMUMachine ss2000_machine = {
@@ -1439,7 +1433,7 @@ QEMUMachine ss2000_machine = { @@ -1439,7 +1433,7 @@ QEMUMachine ss2000_machine = {
1439 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1433 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1440 .nodisk_ok = 1, 1434 .nodisk_ok = 1,
1441 .use_scsi = 1, 1435 .use_scsi = 1,
1442 - .max_cpus = 16, 1436 + .max_cpus = 20,
1443 }; 1437 };
1444 1438
1445 static const struct sun4c_hwdef sun4c_hwdefs[] = { 1439 static const struct sun4c_hwdef sun4c_hwdefs[] = {
@@ -1643,6 +1637,5 @@ QEMUMachine ss2_machine = { @@ -1643,6 +1637,5 @@ QEMUMachine ss2_machine = {
1643 .ram_require = PROM_SIZE_MAX + TCX_SIZE, 1637 .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1644 .nodisk_ok = 1, 1638 .nodisk_ok = 1,
1645 .use_scsi = 1, 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,7 +588,7 @@ QEMUMachine sun4u_machine = {
588 .init = sun4u_init, 588 .init = sun4u_init,
589 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, 589 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
590 .nodisk_ok = 1, 590 .nodisk_ok = 1,
591 - .max_cpus = 16, 591 + .max_cpus = 1, // XXX for now
592 }; 592 };
593 593
594 QEMUMachine sun4v_machine = { 594 QEMUMachine sun4v_machine = {
@@ -597,7 +597,7 @@ QEMUMachine sun4v_machine = { @@ -597,7 +597,7 @@ QEMUMachine sun4v_machine = {
597 .init = sun4v_init, 597 .init = sun4v_init,
598 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, 598 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
599 .nodisk_ok = 1, 599 .nodisk_ok = 1,
600 - .max_cpus = 16, 600 + .max_cpus = 1, // XXX for now
601 }; 601 };
602 602
603 QEMUMachine niagara_machine = { 603 QEMUMachine niagara_machine = {
@@ -606,5 +606,5 @@ QEMUMachine niagara_machine = { @@ -606,5 +606,5 @@ QEMUMachine niagara_machine = {
606 .init = niagara_init, 606 .init = niagara_init,
607 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, 607 .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
608 .nodisk_ok = 1, 608 .nodisk_ok = 1,
609 - .max_cpus = 16, 609 + .max_cpus = 1, // XXX for now
610 }; 610 };