Remove nodisk_ok machine feature
PATCH RESEND 1/1 Remove nodisk_ok machine feature
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.
---
hw/boards.h | 1 - hw/mips_jazz.c | 2 -- hw/mips_malta.c | 1 - hw/mips_mipssim.c | 1 - hw/mips_r4k.c | 1 - hw/sun4m.c | 12 ------------ hw/sun4u.c | 3 --- vl.c | 4 ---- 8 files changed, 0 insertions(+), 25 deletions(-)
hw/boards.h +0 -1
@@ -16,7 +16,6 @@ typedef struct QEMUMachine {QEMUMachineInitFunc *init;#define RAMSIZE_FIXED (1 << 0)ram_addr_t ram_require; -int nodisk_ok;int use_scsi;int max_cpus;struct QEMUMachine *next;
hw/mips_jazz.c +0 -2
@@ -294,7 +294,6 @@ QEMUMachine mips_magnum_machine = { .desc = "MIPS Magnum", .init = mips_magnum_init, .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -303,6 +302,5 @@ QEMUMachine mips_pica61_machine = { .desc = "Acer Pica 61", .init = mips_pica61_init, .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
hw/mips_malta.c +0 -1
@@ -958,5 +958,4 @@ QEMUMachine mips_malta_machine = { .desc = "MIPS Malta Core LV", .init = mips_malta_init, .ram_require = VGA_RAM_SIZE + BIOS_SIZE, - .nodisk_ok = 1, };
hw/mips_mipssim.c +0 -1
@@ -185,5 +185,4 @@ QEMUMachine mips_mipssim_machine = { .desc = "MIPS MIPSsim platform", .init = mips_mipssim_init, .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */, - .nodisk_ok = 1, };
hw/mips_r4k.c +0 -1
@@ -282,5 +282,4 @@ QEMUMachine mips_machine = { .desc = "mips r4k platform", .init = mips_r4k_init, .ram_require = VGA_RAM_SIZE + BIOS_SIZE, - .nodisk_ok = 1, };
hw/sun4m.c +0 -12
@@ -1030,7 +1030,6 @@ QEMUMachine ss5_machine = { .desc = "Sun4m platform, SPARCstation 5", .init = ss5_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1039,7 +1038,6 @@ QEMUMachine ss10_machine = { .desc = "Sun4m platform, SPARCstation 10", .init = ss10_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, .max_cpus = 4, };
@@ -1049,7 +1047,6 @@ QEMUMachine ss600mp_machine = { .desc = "Sun4m platform, SPARCserver 600MP", .init = ss600mp_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, .max_cpus = 4, };
@@ -1059,7 +1056,6 @@ QEMUMachine ss20_machine = { .desc = "Sun4m platform, SPARCstation 20", .init = ss20_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, .max_cpus = 4, };
@@ -1069,7 +1065,6 @@ QEMUMachine voyager_machine = { .desc = "Sun4m platform, SPARCstation Voyager", .init = vger_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1078,7 +1073,6 @@ QEMUMachine ss_lx_machine = { .desc = "Sun4m platform, SPARCstation LX", .init = ss_lx_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1087,7 +1081,6 @@ QEMUMachine ss4_machine = { .desc = "Sun4m platform, SPARCstation 4", .init = ss4_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1096,7 +1089,6 @@ QEMUMachine scls_machine = { .desc = "Sun4m platform, SPARCClassic", .init = scls_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1105,7 +1097,6 @@ QEMUMachine sbook_machine = { .desc = "Sun4m platform, SPARCbook", .init = sbook_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
@@ -1360,7 +1351,6 @@ QEMUMachine ss1000_machine = { .desc = "Sun4d platform, SPARCserver 1000", .init = ss1000_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, .max_cpus = 8, };
@@ -1370,7 +1360,6 @@ QEMUMachine ss2000_machine = { .desc = "Sun4d platform, SPARCcenter 2000", .init = ss2000_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, .max_cpus = 20, };
@@ -1581,6 +1570,5 @@ QEMUMachine ss2_machine = { .desc = "Sun4c platform, SPARCstation 2", .init = ss2_init, .ram_require = PROM_SIZE_MAX + TCX_SIZE, - .nodisk_ok = 1, .use_scsi = 1, };
hw/sun4u.c +0 -3
@@ -597,7 +597,6 @@ QEMUMachine sun4u_machine = { .desc = "Sun4u platform", .init = sun4u_init, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, - .nodisk_ok = 1, .max_cpus = 1, // XXX for now };
@@ -606,7 +605,6 @@ QEMUMachine sun4v_machine = { .desc = "Sun4v platform", .init = sun4v_init, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, - .nodisk_ok = 1, .max_cpus = 1, // XXX for now };
@@ -615,6 +613,5 @@ QEMUMachine niagara_machine = { .desc = "Sun4v platform, Niagara", .init = niagara_init, .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE, - .nodisk_ok = 1, .max_cpus = 1, // XXX for now };
vl.c +0 -4
@@ -5387,10 +5387,6 @@ int main(int argc, char **argv, char **envp) linux_boot = (kernel_filename !=NULL ); 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' ) {fprintf (stderr,"-append only allowed with -kernel option\n" );exit (1 );
Anthony Liguori
AppliedQuoted 7 lines · Jan Kiszka
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/biosfails to boot from it.Signed-off-by Jan Kiszka <[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 9 lines
Quoted 8 lines · Jan Kiszka
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
thefirmware/biosfails to boot from it.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Jan Kiszka <[email protected]>Applied. Thanks.
This has the side effect of trying to boot when one just runs qemu
instead of dumping the help...
is it really intended ?
François.
Quoted 6 lines · François Revol
This has the side effect of trying to boot when one just runs qemu
instead of dumping the help...
is it really intended ?
Yes. I've warned people in the past that that behavior is going to change. If you want the help output, you should pass -h.
Regards,
Anthony Liguori