[Qemu-devel] [6899] Remove nodisk_ok machine feature (Jan Kiszka)

[Anthony Liguori]

Revision: 6899
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6899
Author:   aliguori
Date:     2009-03-28 17:28:58 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Remove nodisk_ok machine feature (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/bios fails to boot from it.

Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/boards.h
    trunk/hw/mips_jazz.c
    trunk/hw/mips_malta.c
    trunk/hw/mips_mipssim.c
    trunk/hw/mips_r4k.c
    trunk/hw/sun4m.c
    trunk/hw/sun4u.c
    trunk/vl.c

Modified: trunk/hw/boards.h
===================================================================
--- trunk/hw/boards.h   2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/boards.h   2009-03-28 17:28:58 UTC (rev 6899)
@@ -16,7 +16,6 @@
     QEMUMachineInitFunc *init;
 #define RAMSIZE_FIXED  (1 << 0)
     ram_addr_t ram_require;
-    int nodisk_ok;
     int use_scsi;
     int max_cpus;
     struct QEMUMachine *next;

Modified: trunk/hw/mips_jazz.c
===================================================================
--- trunk/hw/mips_jazz.c        2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/mips_jazz.c        2009-03-28 17:28:58 UTC (rev 6899)
@@ -294,7 +294,6 @@
     .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 @@
     .desc = "Acer Pica 61",
     .init = mips_pica61_init,
     .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
-    .nodisk_ok = 1,
     .use_scsi = 1,
 };

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c       2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/mips_malta.c       2009-03-28 17:28:58 UTC (rev 6899)
@@ -958,5 +958,4 @@
     .desc = "MIPS Malta Core LV",
     .init = mips_malta_init,
     .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
-    .nodisk_ok = 1,
 };

Modified: trunk/hw/mips_mipssim.c
===================================================================
--- trunk/hw/mips_mipssim.c     2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/mips_mipssim.c     2009-03-28 17:28:58 UTC (rev 6899)
@@ -185,5 +185,4 @@
     .desc = "MIPS MIPSsim platform",
     .init = mips_mipssim_init,
     .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
-    .nodisk_ok = 1,
 };

Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c 2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/mips_r4k.c 2009-03-28 17:28:58 UTC (rev 6899)
@@ -282,5 +282,4 @@
     .desc = "mips r4k platform",
     .init = mips_r4k_init,
     .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
-    .nodisk_ok = 1,
 };

Modified: trunk/hw/sun4m.c
===================================================================
--- trunk/hw/sun4m.c    2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/sun4m.c    2009-03-28 17:28:58 UTC (rev 6899)
@@ -1030,7 +1030,6 @@
     .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 @@
     .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 @@
     .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 @@
     .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 @@
     .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 @@
     .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 @@
     .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 @@
     .desc = "Sun4m platform, SPARCClassic",
     .init = scls_init,
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
-    .nodisk_ok = 1,
     .use_scsi = 1,
 };
 
@@ -1105,7 +1097,6 @@
     .desc = "Sun4m platform, SPARCbook",
     .init = sbook_init,
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
-    .nodisk_ok = 1,
     .use_scsi = 1,
 };
 
@@ -1360,7 +1351,6 @@
     .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 @@
     .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 @@
     .desc = "Sun4c platform, SPARCstation 2",
     .init = ss2_init,
     .ram_require = PROM_SIZE_MAX + TCX_SIZE,
-    .nodisk_ok = 1,
     .use_scsi = 1,
 };

Modified: trunk/hw/sun4u.c
===================================================================
--- trunk/hw/sun4u.c    2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/hw/sun4u.c    2009-03-28 17:28:58 UTC (rev 6899)
@@ -597,7 +597,6 @@
     .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 @@
     .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 @@
     .desc = "Sun4v platform, Niagara",
     .init = niagara_init,
     .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
-    .nodisk_ok = 1,
     .max_cpus = 1, // XXX for now
 };

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-03-28 17:28:53 UTC (rev 6898)
+++ trunk/vl.c  2009-03-28 17:28:58 UTC (rev 6899)
@@ -5033,10 +5033,6 @@
     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);