[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot
From: |
Amos Kong |
Subject: |
[Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot |
Date: |
Wed, 9 Jan 2013 16:39:13 +0800 |
Current seabios will try to boot from selected devices first,
if they are all failed, seabios will also try to boot from
un-selected devices.
We need to make it configurable. I already posted a seabios
patch to add a new device type to halt booting. Qemu can add
"HALT" at the end of bootindex string, then seabios will halt
booting after trying to boot from selected devices.
This option only effects when boot priority is changed by
bootindex options, the old style(-boot order=..) will still
try to boot from un-selected devices.
v2: add HALT entry in get_boot_devices_list()
define boot_strict to bool
Signed-off-by: Amos Kong <address@hidden>
---
[SeaBIOS PATCH v3] boot: add a new type to halt booting
https://github.com/kongove/seabios/commit/39aeded2da6254eab2c34de92371ce1cad5c793e
bios.bin: http://kongove.fedorapeople.org/pub/added-halt-type-bios.bin
---
qemu-config.c | 3 +++
qemu-options.hx | 8 ++++++--
vl.c | 22 +++++++++++++++++++++-
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/qemu-config.c b/qemu-config.c
index 2188c3e..dd6d249 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -612,6 +612,9 @@ QemuOptsList qemu_boot_opts = {
}, {
.name = "reboot-timeout",
.type = QEMU_OPT_STRING,
+ }, {
+ .name = "strict",
+ .type = QEMU_OPT_STRING,
},
{ /*End of list */ }
},
diff --git a/qemu-options.hx b/qemu-options.hx
index 9df0cde..5408837 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -376,14 +376,14 @@ ETEXI
DEF("boot", HAS_ARG, QEMU_OPTION_boot,
"-boot [order=drives][,once=drives][,menu=on|off]\n"
- " [,splash=sp_name][,splash-time=sp_time][,reboot-timeout=rb_time]\n"
+ "
[,splash=sp_name][,splash-time=sp_time][,reboot-timeout=rb_time][,strict=on|off]\n"
" 'drives': floppy (a), hard disk (c), CD-ROM (d), network
(n)\n"
" 'sp_name': the file's name that would be passed to bios
as logo picture, if menu=on\n"
" 'sp_time': the period that splash picture last if
menu=on, unit is ms\n"
" 'rb_timeout': the timeout before guest reboot when boot
failed, unit is ms\n",
QEMU_ARCH_ALL)
STEXI
address@hidden -boot
address@hidden,address@hidden,menu=on|off][,address@hidden,address@hidden,address@hidden
address@hidden -boot
address@hidden,address@hidden,menu=on|off][,address@hidden,address@hidden,address@hidden,strict=on|off]
@findex -boot
Specify boot order @var{drives} as a string of drive letters. Valid
drive letters depend on the target achitecture. The x86 PC uses: a, b
@@ -407,6 +407,10 @@ when boot failed, then reboot. If @var{rb_timeout} is
'-1', guest will not
reboot, qemu passes '-1' to bios by default. Currently Seabios for X86
system support it.
+Do strict boot via @option{strict=on} as far as firmware/BIOS
+supports it. This only effects when boot priority is changed by
+bootindex options. The default is non-strict boot.
+
@example
# try to boot from network first, then from hard disk
qemu-system-i386 -boot order=nc
diff --git a/vl.c b/vl.c
index 79e5122..1c64449 100644
--- a/vl.c
+++ b/vl.c
@@ -230,6 +230,7 @@ int ctrl_grab = 0;
unsigned int nb_prom_envs = 0;
const char *prom_envs[MAX_PROM_ENVS];
int boot_menu;
+bool boot_strict = false;
uint8_t *boot_splash_filedata;
int boot_splash_filedata_size;
uint8_t qemu_extra_params_fw[2];
@@ -1052,6 +1053,12 @@ char *get_boot_devices_list(uint32_t *size)
*size = total;
+ if (boot_strict && *size > 0) {
+ list[total-1] = '\n';
+ list = g_realloc(list, total + 4);
+ memcpy(&list[total], "HALT", 4);
+ *size = total + 4;
+ }
return list;
}
@@ -2804,7 +2811,7 @@ int main(int argc, char **argv, char **envp)
static const char * const params[] = {
"order", "once", "menu",
"splash", "splash-time",
- "reboot-timeout", NULL
+ "reboot-timeout", "strict", NULL
};
char buf[sizeof(boot_devices)];
char *standard_boot_devices;
@@ -2847,6 +2854,19 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
}
+ if (get_param_value(buf, sizeof(buf),
+ "strict", optarg)) {
+ if (!strcmp(buf, "on")) {
+ boot_strict = true;
+ } else if (!strcmp(buf, "off")) {
+ boot_strict = false;
+ } else {
+ fprintf(stderr,
+ "qemu: invalid option value '%s'\n",
+ buf);
+ exit(1);
+ }
+ }
qemu_opts_parse(qemu_find_opts("boot-opts"),
optarg, 0);
}
--
1.7.1
- [Qemu-devel] [Qemu PATCH] add a boot option to do strict boot, Amos Kong, 2013/01/09
- Re: [Qemu-devel] [Qemu PATCH] add a boot option to do strict boot, Gleb Natapov, 2013/01/09
- [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot,
Amos Kong <=
- Re: [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot, Amos Kong, 2013/01/09
- Re: [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot, Amos Kong, 2013/01/22
- Re: [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot, Amos Kong, 2013/01/22
- Re: [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot, Eric Blake, 2013/01/22
- Re: [Qemu-devel] [Qemu PATCH v2] add a boot option to do strict boot, Anthony Liguori, 2013/01/22