From e0f084bfc941109047055e229d70695af11a0541 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 2 Jul 2009 00:19:02 +0200 Subject: [PATCH] Add boot-once support This allows to specify an exceptional boot order only for the first startup of the guest. After reboot, qemu will switch back to the default order (or what was specified via 'order='). Makes installing from CD images and then booting the freshly set up harddisk more handy. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- vl.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 963b8999f7..7360d4f021 100644 --- a/vl.c +++ b/vl.c @@ -2402,6 +2402,16 @@ static int parse_bootdevices(char *devices) return bitmap; } +static void restore_boot_devices(void *opaque) +{ + char *standard_boot_devices = opaque; + + qemu_boot_set(standard_boot_devices); + + qemu_unregister_reset(restore_boot_devices, standard_boot_devices); + qemu_free(standard_boot_devices); +} + static void numa_add(const char *optarg) { char option[128]; @@ -5111,9 +5121,10 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_boot: { static const char * const params[] = { - "order", NULL + "order", "once", NULL }; char buf[sizeof(boot_devices)]; + char *standard_boot_devices; int legacy = 0; if (!strchr(optarg, '=')) { @@ -5131,6 +5142,16 @@ int main(int argc, char **argv, char **envp) boot_devices_bitmap = parse_bootdevices(buf); pstrcpy(boot_devices, sizeof(boot_devices), buf); } + if (!legacy) { + if (get_param_value(buf, sizeof(buf), + "once", optarg)) { + boot_devices_bitmap |= parse_bootdevices(buf); + standard_boot_devices = qemu_strdup(boot_devices); + pstrcpy(boot_devices, sizeof(boot_devices), buf); + qemu_register_reset(restore_boot_devices, + standard_boot_devices); + } + } } break; case QEMU_OPTION_fda: -- 2.11.0