From 25de59350606772a4df479f0f49721281091ec56 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 27 Jan 2012 19:55:43 +0100 Subject: [PATCH] Improve default machine options usability So far we overwrite the machine options completely with defaults if no accel=value is provided. More user friendly is to fill in only unspecified options. The new qemu_opts_set_defaults enables this. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- vl.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/vl.c b/vl.c index 6af0f83ae..138f6bc1e 100644 --- a/vl.c +++ b/vl.c @@ -3153,21 +3153,8 @@ int main(int argc, char **argv, char **envp) * specified either by the configuration file or by the command line. */ if (machine->default_machine_opts) { - QemuOptsList *list = qemu_find_opts("machine"); - const char *p = NULL; - - if (!QTAILQ_EMPTY(&list->head)) { - p = qemu_opt_get(QTAILQ_FIRST(&list->head), "accel"); - } - if (p == NULL) { - qemu_opts_reset(list); - opts = qemu_opts_parse(list, machine->default_machine_opts, 0); - if (!opts) { - fprintf(stderr, "parse error for machine %s: %s\n", - machine->name, machine->default_machine_opts); - exit(1); - } - } + qemu_opts_set_defaults(qemu_find_opts("machine"), + machine->default_machine_opts, 0); } qemu_opts_foreach(qemu_find_opts("device"), default_driver_check, NULL, 0);