From 9538749118d47dfcd3ed45804736027d87ec054e Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 2 Jul 2009 00:19:02 +0200 Subject: Add boot menu control via command line switch Disable the lengthy BIOS prompt for selecting a boot device by default, but let the user reenable it via '-boot menu=on'. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- vl.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 7360d4f021..2fbea375ab 100644 --- a/vl.c +++ b/vl.c @@ -254,6 +254,7 @@ const char *prom_envs[MAX_PROM_ENVS]; #endif int nb_drives_opt; struct drive_opt drives_opt[MAX_DRIVES]; +int boot_menu; int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; @@ -5121,7 +5122,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_boot: { static const char * const params[] = { - "order", "once", NULL + "order", "once", "menu", NULL }; char buf[sizeof(boot_devices)]; char *standard_boot_devices; @@ -5151,6 +5152,19 @@ int main(int argc, char **argv, char **envp) qemu_register_reset(restore_boot_devices, standard_boot_devices); } + if (get_param_value(buf, sizeof(buf), + "menu", optarg)) { + if (!strcmp(buf, "on")) { + boot_menu = 1; + } else if (!strcmp(buf, "off")) { + boot_menu = 0; + } else { + fprintf(stderr, + "qemu: invalid option value '%s'\n", + buf); + exit(1); + } + } } } break; -- cgit v1.2.1