Revision 6295e564

b/hw/boards.h
16 16
    QEMUMachineInitFunc *init;
17 17
#define RAMSIZE_FIXED	(1 << 0)
18 18
    ram_addr_t ram_require;
19
    int nodisk_ok;
20 19
    int use_scsi;
21 20
    int max_cpus;
22 21
    struct QEMUMachine *next;
b/hw/mips_jazz.c
294 294
    .desc = "MIPS Magnum",
295 295
    .init = mips_magnum_init,
296 296
    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
297
    .nodisk_ok = 1,
298 297
    .use_scsi = 1,
299 298
};
300 299

  
......
303 302
    .desc = "Acer Pica 61",
304 303
    .init = mips_pica61_init,
305 304
    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
306
    .nodisk_ok = 1,
307 305
    .use_scsi = 1,
308 306
};
b/hw/mips_malta.c
958 958
    .desc = "MIPS Malta Core LV",
959 959
    .init = mips_malta_init,
960 960
    .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
961
    .nodisk_ok = 1,
962 961
};
b/hw/mips_mipssim.c
185 185
    .desc = "MIPS MIPSsim platform",
186 186
    .init = mips_mipssim_init,
187 187
    .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
188
    .nodisk_ok = 1,
189 188
};
b/hw/mips_r4k.c
282 282
    .desc = "mips r4k platform",
283 283
    .init = mips_r4k_init,
284 284
    .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
285
    .nodisk_ok = 1,
286 285
};
b/hw/sun4m.c
1030 1030
    .desc = "Sun4m platform, SPARCstation 5",
1031 1031
    .init = ss5_init,
1032 1032
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1033
    .nodisk_ok = 1,
1034 1033
    .use_scsi = 1,
1035 1034
};
1036 1035

  
......
1039 1038
    .desc = "Sun4m platform, SPARCstation 10",
1040 1039
    .init = ss10_init,
1041 1040
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1042
    .nodisk_ok = 1,
1043 1041
    .use_scsi = 1,
1044 1042
    .max_cpus = 4,
1045 1043
};
......
1049 1047
    .desc = "Sun4m platform, SPARCserver 600MP",
1050 1048
    .init = ss600mp_init,
1051 1049
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1052
    .nodisk_ok = 1,
1053 1050
    .use_scsi = 1,
1054 1051
    .max_cpus = 4,
1055 1052
};
......
1059 1056
    .desc = "Sun4m platform, SPARCstation 20",
1060 1057
    .init = ss20_init,
1061 1058
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1062
    .nodisk_ok = 1,
1063 1059
    .use_scsi = 1,
1064 1060
    .max_cpus = 4,
1065 1061
};
......
1069 1065
    .desc = "Sun4m platform, SPARCstation Voyager",
1070 1066
    .init = vger_init,
1071 1067
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1072
    .nodisk_ok = 1,
1073 1068
    .use_scsi = 1,
1074 1069
};
1075 1070

  
......
1078 1073
    .desc = "Sun4m platform, SPARCstation LX",
1079 1074
    .init = ss_lx_init,
1080 1075
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1081
    .nodisk_ok = 1,
1082 1076
    .use_scsi = 1,
1083 1077
};
1084 1078

  
......
1087 1081
    .desc = "Sun4m platform, SPARCstation 4",
1088 1082
    .init = ss4_init,
1089 1083
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1090
    .nodisk_ok = 1,
1091 1084
    .use_scsi = 1,
1092 1085
};
1093 1086

  
......
1096 1089
    .desc = "Sun4m platform, SPARCClassic",
1097 1090
    .init = scls_init,
1098 1091
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1099
    .nodisk_ok = 1,
1100 1092
    .use_scsi = 1,
1101 1093
};
1102 1094

  
......
1105 1097
    .desc = "Sun4m platform, SPARCbook",
1106 1098
    .init = sbook_init,
1107 1099
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1108
    .nodisk_ok = 1,
1109 1100
    .use_scsi = 1,
1110 1101
};
1111 1102

  
......
1360 1351
    .desc = "Sun4d platform, SPARCserver 1000",
1361 1352
    .init = ss1000_init,
1362 1353
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1363
    .nodisk_ok = 1,
1364 1354
    .use_scsi = 1,
1365 1355
    .max_cpus = 8,
1366 1356
};
......
1370 1360
    .desc = "Sun4d platform, SPARCcenter 2000",
1371 1361
    .init = ss2000_init,
1372 1362
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1373
    .nodisk_ok = 1,
1374 1363
    .use_scsi = 1,
1375 1364
    .max_cpus = 20,
1376 1365
};
......
1581 1570
    .desc = "Sun4c platform, SPARCstation 2",
1582 1571
    .init = ss2_init,
1583 1572
    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1584
    .nodisk_ok = 1,
1585 1573
    .use_scsi = 1,
1586 1574
};
b/hw/sun4u.c
597 597
    .desc = "Sun4u platform",
598 598
    .init = sun4u_init,
599 599
    .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
600
    .nodisk_ok = 1,
601 600
    .max_cpus = 1, // XXX for now
602 601
};
603 602

  
......
606 605
    .desc = "Sun4v platform",
607 606
    .init = sun4v_init,
608 607
    .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
609
    .nodisk_ok = 1,
610 608
    .max_cpus = 1, // XXX for now
611 609
};
612 610

  
......
615 613
    .desc = "Sun4v platform, Niagara",
616 614
    .init = niagara_init,
617 615
    .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
618
    .nodisk_ok = 1,
619 616
    .max_cpus = 1, // XXX for now
620 617
};
b/vl.c
5033 5033
    linux_boot = (kernel_filename != NULL);
5034 5034
    net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
5035 5035

  
5036
    if (!linux_boot && net_boot == 0 &&
5037
        !machine->nodisk_ok && nb_drives_opt == 0)
5038
        help(1);
5039

  
5040 5036
    if (!linux_boot && *kernel_cmdline != '\0') {
5041 5037
        fprintf(stderr, "-append only allowed with -kernel option\n");
5042 5038
        exit(1);

Also available in: Unified diff