[PATCH 2/4] add args for fastboot and quietboot

Cory Fields
2009-02-06T23:19:21Z

-fastboot is implied by -boot -kernel or -quietboot
because if specified, there's no need to show a menu

-quietboot must be explicitly called

Signed-off-by: Cory Fields <FOSS@AtlasTechnologiesInc.com>

---
qemu/vl.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index 93ed5fe..467171c 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -190,6 +190,8 @@ static int vga_ram_size;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
static DisplayState *display_state;
int nographic;
+int fastboot = 0;
+int quietboot = 0;
static int curses;
static int sdl;
const char* keyboard_layout = NULL;
@@ -4000,6 +4002,8 @@ static void help(int exitcode)
"-sd file use 'file' as SecureDigital card image\n"
"-pflash file use 'file' as a parallel flash image\n"
"-boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n)\n"
+ "-fastboot skip boot menu timer\n"
+ "-quietboot silence bios display (implies -fastboot)\n"
"-snapshot write to temporary files instead of disk image files\n"
"-m megs set virtual RAM size to megs MB [default=%d]\n"
#ifndef _WIN32
@@ -4238,6 +4242,8 @@ enum {
QEMU_OPTION_nographic,
QEMU_OPTION_curses,
QEMU_OPTION_no_frame,
+ QEMU_OPTION_fastboot,
+ QEMU_OPTION_quietboot,
QEMU_OPTION_alt_grab,
QEMU_OPTION_no_quit,
QEMU_OPTION_sdl,
@@ -4344,6 +4350,8 @@ static const QEMUOption qemu_options[] = {
{ "sd", HAS_ARG, QEMU_OPTION_sd },
{ "pflash", HAS_ARG, QEMU_OPTION_pflash },
{ "boot", HAS_ARG, QEMU_OPTION_boot },
+ { "fastboot", 0, QEMU_OPTION_fastboot },
+ { "quietboot", 0, QEMU_OPTION_quietboot },
{ "snapshot", 0, QEMU_OPTION_snapshot },
{ "m", HAS_ARG, QEMU_OPTION_m },
#ifndef _WIN32
@@ -5163,9 +5171,17 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
boot_devices_bitmap |= 1 << (*p - 'a');
+ fastboot = 1;
}
}
break;
+ case QEMU_OPTION_fastboot:
+ fastboot=1;
+ break;
+ case QEMU_OPTION_quietboot:
+ quietboot=1;
+ fastboot=1;
+ break;
case QEMU_OPTION_fda:
case QEMU_OPTION_fdb:
drive_add(optarg, FD_ALIAS, popt->index - QEMU_OPTION_fda);
@@ -5698,6 +5714,7 @@ int main(int argc, char **argv, char **envp)
#endif
linux_boot = (kernel_filename != NULL);
net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
+ if (linux_boot ) fastboot = 1;

if (!linux_boot && net_boot == 0 &&
!machine->nodisk_ok && nb_drives_opt == 0)
--
1.6.0.6