diff options
| -rw-r--r-- | hw/i386/pc.c | 7 | ||||
| -rw-r--r-- | include/hw/hw.h | 4 | ||||
| -rw-r--r-- | include/qemu/option.h | 2 | ||||
| -rw-r--r-- | qemu-options.hx | 3 | ||||
| -rw-r--r-- | util/qemu-option.c | 30 | ||||
| -rw-r--r-- | vl.c | 121 |
6 files changed, 47 insertions, 120 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e0fbb860ed..5e8f143bc2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -266,7 +266,7 @@ static int boot_device2nibble(char boot_device) return 0; } -static int set_boot_dev(ISADevice *s, const char *boot_device, int fd_bootchk) +static int set_boot_dev(ISADevice *s, const char *boot_device) { #define PC_MAX_BOOT_DEVICES 3 int nbds, bds[3] = { 0, }; @@ -292,7 +292,7 @@ static int set_boot_dev(ISADevice *s, const char *boot_device, int fd_bootchk) static int pc_boot_set(void *opaque, const char *boot_device) { - return set_boot_dev(opaque, boot_device, 0); + return set_boot_dev(opaque, boot_device); } typedef struct pc_cmos_init_late_arg { @@ -407,8 +407,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, cpu_hotplug_cb.cpu_added_notifier.notify = rtc_notify_cpu_added; qemu_register_cpu_added_notifier(&cpu_hotplug_cb.cpu_added_notifier); - /* set boot devices, and disable floppy signature check if requested */ - if (set_boot_dev(s, boot_device, fd_bootchk)) { + if (set_boot_dev(s, boot_device)) { exit(1); } diff --git a/include/hw/hw.h b/include/hw/hw.h index 1fb9afa322..cc9f847ea6 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -44,9 +44,9 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); /* handler to set the boot_device order for a specific type of QEMUMachine */ /* return 0 if success */ -typedef int QEMUBootSetHandler(void *opaque, const char *boot_devices); +typedef int QEMUBootSetHandler(void *opaque, const char *boot_order); void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque); -int qemu_boot_set(const char *boot_devices); +int qemu_boot_set(const char *boot_order); #ifdef NEED_CPU_H #if TARGET_LONG_BITS == 64 diff --git a/include/qemu/option.h b/include/qemu/option.h index bdb6d218b4..a83c700323 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -55,8 +55,6 @@ int get_next_param_value(char *buf, int buf_size, const char *tag, const char **pstr); int get_param_value(char *buf, int buf_size, const char *tag, const char *str); -int check_params(char *buf, int buf_size, - const char * const *params, const char *str); /* diff --git a/qemu-options.hx b/qemu-options.hx index bf94862b58..8355f9bd8e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1268,9 +1268,8 @@ DEF("no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk, STEXI @item -no-fd-bootchk @findex -no-fd-bootchk -Disable boot signature checking for floppy disks in Bochs BIOS. It may +Disable boot signature checking for floppy disks in BIOS. May be needed to boot from old floppy disks. -TODO: check reference to Bochs BIOS. ETEXI DEF("no-acpi", 0, QEMU_OPTION_no_acpi, diff --git a/util/qemu-option.c b/util/qemu-option.c index 8b74bf1f7a..412c425518 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -123,36 +123,6 @@ int get_param_value(char *buf, int buf_size, return get_next_param_value(buf, buf_size, tag, &str); } -int check_params(char *buf, int buf_size, - const char * const *params, const char *str) -{ - const char *p; - int i; - - p = str; - while (*p != '\0') { - p = get_opt_name(buf, buf_size, p, '='); - if (*p != '=') { - return -1; - } - p++; - for (i = 0; params[i] != NULL; i++) { - if (!strcmp(params[i], buf)) { - break; - } - } - if (params[i] == NULL) { - return -1; - } - p = get_opt_value(NULL, 0, p); - if (*p != ',') { - break; - } - p++; - } - return 0; -} - /* * Searches an option list for an option with the given name */ diff --git a/vl.c b/vl.c index f94ec9ca17..767e0204db 100644 --- a/vl.c +++ b/vl.c @@ -434,9 +434,10 @@ static QemuOptsList qemu_machine_opts = { static QemuOptsList qemu_boot_opts = { .name = "boot-opts", + .implied_opt_name = "order", + .merge_lists = true, .head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head), .desc = { - /* the three names below are not used now */ { .name = "order", .type = QEMU_OPT_STRING, @@ -445,8 +446,7 @@ static QemuOptsList qemu_boot_opts = { .type = QEMU_OPT_STRING, }, { .name = "menu", - .type = QEMU_OPT_STRING, - /* following are really used */ + .type = QEMU_OPT_BOOL, }, { .name = "splash", .type = QEMU_OPT_STRING, @@ -1149,15 +1149,15 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque) boot_set_opaque = opaque; } -int qemu_boot_set(const char *boot_devices) +int qemu_boot_set(const char *boot_order) { if (!boot_set_handler) { return -EINVAL; } - return boot_set_handler(boot_set_opaque, boot_devices); + return boot_set_handler(boot_set_opaque, boot_order); } -static void validate_bootdevices(char *devices) +static void validate_bootdevices(const char *devices) { /* We just do some generic consistency checks */ const char *p; @@ -1185,9 +1185,9 @@ static void validate_bootdevices(char *devices) } } -static void restore_boot_devices(void *opaque) +static void restore_boot_order(void *opaque) { - char *standard_boot_devices = opaque; + char *normal_boot_order = opaque; static int first = 1; /* Restore boot order and remove ourselves after the first boot */ @@ -1196,10 +1196,10 @@ static void restore_boot_devices(void *opaque) return; } - qemu_boot_set(standard_boot_devices); + qemu_boot_set(normal_boot_order); - qemu_unregister_reset(restore_boot_devices, standard_boot_devices); - g_free(standard_boot_devices); + qemu_unregister_reset(restore_boot_order, normal_boot_order); + g_free(normal_boot_order); } void add_boot_device_path(int32_t bootindex, DeviceState *dev, @@ -2841,7 +2841,7 @@ int main(int argc, char **argv, char **envp) const char *icount_option = NULL; const char *initrd_filename; const char *kernel_filename, *kernel_cmdline; - char boot_devices[33] = ""; + const char *boot_order = NULL; DisplayState *ds; int cyls, heads, secs, translation; QemuOpts *hda_opts = NULL, *opts, *machine_opts; @@ -3131,71 +3131,9 @@ int main(int argc, char **argv, char **envp) drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS); break; case QEMU_OPTION_boot: - { - static const char * const params[] = { - "order", "once", "menu", - "splash", "splash-time", - "reboot-timeout", "strict", NULL - }; - char buf[sizeof(boot_devices)]; - char *standard_boot_devices; - int legacy = 0; - - if (!strchr(optarg, '=')) { - legacy = 1; - pstrcpy(buf, sizeof(buf), optarg); - } else if (check_params(buf, sizeof(buf), params, optarg) < 0) { - fprintf(stderr, - "qemu: unknown boot parameter '%s' in '%s'\n", - buf, optarg); - exit(1); - } - - if (legacy || - get_param_value(buf, sizeof(buf), "order", optarg)) { - validate_bootdevices(buf); - pstrcpy(boot_devices, sizeof(boot_devices), buf); - } - if (!legacy) { - if (get_param_value(buf, sizeof(buf), - "once", optarg)) { - validate_bootdevices(buf); - standard_boot_devices = g_strdup(boot_devices); - pstrcpy(boot_devices, sizeof(boot_devices), buf); - 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); - } - } - 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); - } - } - if (!qemu_opts_parse(qemu_find_opts("boot-opts"), - optarg, 0)) { - exit(1); - } - } + opts = qemu_opts_parse(qemu_find_opts("boot-opts"), optarg, 1); + if (!opts) { + exit(1); } break; case QEMU_OPTION_fda: @@ -4136,6 +4074,31 @@ int main(int argc, char **argv, char **envp) kernel_filename = initrd_filename = kernel_cmdline = NULL; } + if (!boot_order) { + boot_order = machine->boot_order; + } + opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); + if (opts) { + char *normal_boot_order; + const char *order, *once; + + order = qemu_opt_get(opts, "order"); + if (order) { + validate_bootdevices(order); + boot_order = order; + } + + once = qemu_opt_get(opts, "once"); + if (once) { + validate_bootdevices(once); + normal_boot_order = g_strdup(boot_order); + boot_order = once; + qemu_register_reset(restore_boot_order, normal_boot_order); + } + + boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu); + } + if (!kernel_cmdline) { kernel_cmdline = ""; } @@ -4300,9 +4263,7 @@ int main(int argc, char **argv, char **envp) qdev_machine_init(); QEMUMachineInitArgs args = { .ram_size = ram_size, - .boot_device = (boot_devices[0] == '\0') ? - machine->boot_order : - boot_devices, + .boot_device = boot_order, .kernel_filename = kernel_filename, .kernel_cmdline = kernel_cmdline, .initrd_filename = initrd_filename, |