OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Remove nodisk_ok machine feature (Jan Kiszka)

Browse Source 
All archs have some kind of firmware to load and can be fine with it
already. So there is not much use in enforcing the presence of a disk.
If the system setup requires one, the user will notice it anyway once
the firmware/bios fails to boot from it.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6899 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-03-28 17:28:58 +00:00
parent bf9b48af99
commit 6295e564f7
8 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/boards.h
View File

@ -16,7 +16,6 @@ typedef struct QEMUMachine {
QEMUMachineInitFunc *init; QEMUMachineInitFunc *init;
#define RAMSIZE_FIXED (1 << 0) #define RAMSIZE_FIXED (1 << 0)
ram_addr_t ram_require; ram_addr_t ram_require;
int nodisk_ok;
int use_scsi; int use_scsi;
int max_cpus; int max_cpus;
struct QEMUMachine *next; struct QEMUMachine *next;

2
hw/mips_jazz.c
View File

@ -294,7 +294,6 @@ QEMUMachine mips_magnum_machine = {
.desc = "MIPS Magnum", .desc = "MIPS Magnum",
.init = mips_magnum_init, .init = mips_magnum_init,
.ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -303,6 +302,5 @@ QEMUMachine mips_pica61_machine = {
.desc = "Acer Pica 61", .desc = "Acer Pica 61",
.init = mips_pica61_init, .init = mips_pica61_init,
.ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };

1
hw/mips_malta.c
View File

@ -958,5 +958,4 @@ QEMUMachine mips_malta_machine = {
.desc = "MIPS Malta Core LV", .desc = "MIPS Malta Core LV",
.init = mips_malta_init, .init = mips_malta_init,
.ram_require = VGA_RAM_SIZE + BIOS_SIZE, .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
.nodisk_ok = 1,
}; };

1
hw/mips_mipssim.c
View File

@ -185,5 +185,4 @@ QEMUMachine mips_mipssim_machine = {
.desc = "MIPS MIPSsim platform", .desc = "MIPS MIPSsim platform",
.init = mips_mipssim_init, .init = mips_mipssim_init,
.ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */, .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
.nodisk_ok = 1,
}; };

1
hw/mips_r4k.c
View File

@ -282,5 +282,4 @@ QEMUMachine mips_machine = {
.desc = "mips r4k platform", .desc = "mips r4k platform",
.init = mips_r4k_init, .init = mips_r4k_init,
.ram_require = VGA_RAM_SIZE + BIOS_SIZE, .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
.nodisk_ok = 1,
}; };

12
hw/sun4m.c
View File

@ -1030,7 +1030,6 @@ QEMUMachine ss5_machine = {
.desc = "Sun4m platform, SPARCstation 5", .desc = "Sun4m platform, SPARCstation 5",
.init = ss5_init, .init = ss5_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1039,7 +1038,6 @@ QEMUMachine ss10_machine = {
.desc = "Sun4m platform, SPARCstation 10", .desc = "Sun4m platform, SPARCstation 10",
.init = ss10_init, .init = ss10_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
.max_cpus = 4, .max_cpus = 4,
}; };
@ -1049,7 +1047,6 @@ QEMUMachine ss600mp_machine = {
.desc = "Sun4m platform, SPARCserver 600MP", .desc = "Sun4m platform, SPARCserver 600MP",
.init = ss600mp_init, .init = ss600mp_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
.max_cpus = 4, .max_cpus = 4,
}; };
@ -1059,7 +1056,6 @@ QEMUMachine ss20_machine = {
.desc = "Sun4m platform, SPARCstation 20", .desc = "Sun4m platform, SPARCstation 20",
.init = ss20_init, .init = ss20_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
.max_cpus = 4, .max_cpus = 4,
}; };
@ -1069,7 +1065,6 @@ QEMUMachine voyager_machine = {
.desc = "Sun4m platform, SPARCstation Voyager", .desc = "Sun4m platform, SPARCstation Voyager",
.init = vger_init, .init = vger_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1078,7 +1073,6 @@ QEMUMachine ss_lx_machine = {
.desc = "Sun4m platform, SPARCstation LX", .desc = "Sun4m platform, SPARCstation LX",
.init = ss_lx_init, .init = ss_lx_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1087,7 +1081,6 @@ QEMUMachine ss4_machine = {
.desc = "Sun4m platform, SPARCstation 4", .desc = "Sun4m platform, SPARCstation 4",
.init = ss4_init, .init = ss4_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1096,7 +1089,6 @@ QEMUMachine scls_machine = {
.desc = "Sun4m platform, SPARCClassic", .desc = "Sun4m platform, SPARCClassic",
.init = scls_init, .init = scls_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1105,7 +1097,6 @@ QEMUMachine sbook_machine = {
.desc = "Sun4m platform, SPARCbook", .desc = "Sun4m platform, SPARCbook",
.init = sbook_init, .init = sbook_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };
@ -1360,7 +1351,6 @@ QEMUMachine ss1000_machine = {
.desc = "Sun4d platform, SPARCserver 1000", .desc = "Sun4d platform, SPARCserver 1000",
.init = ss1000_init, .init = ss1000_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
.max_cpus = 8, .max_cpus = 8,
}; };
@ -1370,7 +1360,6 @@ QEMUMachine ss2000_machine = {
.desc = "Sun4d platform, SPARCcenter 2000", .desc = "Sun4d platform, SPARCcenter 2000",
.init = ss2000_init, .init = ss2000_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
.max_cpus = 20, .max_cpus = 20,
}; };
@ -1581,6 +1570,5 @@ QEMUMachine ss2_machine = {
.desc = "Sun4c platform, SPARCstation 2", .desc = "Sun4c platform, SPARCstation 2",
.init = ss2_init, .init = ss2_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE, .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
.use_scsi = 1, .use_scsi = 1,
}; };

3
hw/sun4u.c
View File

@ -597,7 +597,6 @@ QEMUMachine sun4u_machine = {
.desc = "Sun4u platform", .desc = "Sun4u platform",
.init = sun4u_init, .init = sun4u_init,
.ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.nodisk_ok = 1,
.max_cpus = 1, // XXX for now .max_cpus = 1, // XXX for now
}; };
@ -606,7 +605,6 @@ QEMUMachine sun4v_machine = {
.desc = "Sun4v platform", .desc = "Sun4v platform",
.init = sun4v_init, .init = sun4v_init,
.ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.nodisk_ok = 1,
.max_cpus = 1, // XXX for now .max_cpus = 1, // XXX for now
}; };
@ -615,6 +613,5 @@ QEMUMachine niagara_machine = {
.desc = "Sun4v platform, Niagara", .desc = "Sun4v platform, Niagara",
.init = niagara_init, .init = niagara_init,
.ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.nodisk_ok = 1,
.max_cpus = 1, // XXX for now .max_cpus = 1, // XXX for now
}; };

4
vl.c
View File

@ -5033,10 +5033,6 @@ int main(int argc, char **argv, char **envp)
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF; net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
if (!linux_boot && net_boot == 0 &&
!machine->nodisk_ok && nb_drives_opt == 0)
help(1);
if (!linux_boot && *kernel_cmdline != '\0') { if (!linux_boot && *kernel_cmdline != '\0') {
fprintf(stderr, "-append only allowed with -kernel option\n"); fprintf(stderr, "-append only allowed with -kernel option\n");
exit(1); exit(1);