Switch from QemuOpts to keyval. This enables compound options for accelerators.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- accel/accel.c | 6 ++ include/sysemu/accel.h | 1 + softmmu/vl.c | 134 ++++++++++++++++++----------------------- 3 files changed, 67 insertions(+), 74 deletions(-) diff --git a/accel/accel.c b/accel/accel.c index cb555e3b06..f7fdc2f5a8 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -46,6 +46,12 @@ AccelClass *accel_find(const char *opt_name) return ac; } +bool accel_print_class_properties(const char *opt_name) +{ + g_autofree char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name); + return type_print_class_properties(class_name); +} + int accel_init_machine(AccelState *accel, MachineState *ms) { AccelClass *acc = ACCEL_GET_CLASS(accel); diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index e08b8ab8fa..737db49d21 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -67,6 +67,7 @@ typedef struct AccelClass { OBJECT_GET_CLASS(AccelClass, (obj), TYPE_ACCEL) AccelClass *accel_find(const char *opt_name); +bool accel_print_class_properties(const char *opt_name); int accel_init_machine(AccelState *accel, MachineState *ms); /* Called just before os_setup_post (ie just before drop OS privs) */ diff --git a/softmmu/vl.c b/softmmu/vl.c index 5ade1cf6c5..88738a9f5a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -137,6 +137,7 @@ static const char *loadvm; static const char *accelerators; static QDict *machine_opts_dict; static GSList *object_opts_list = NULL; +static GSList *accel_opts_list = NULL; static ram_addr_t maxram_size; static uint64_t ram_slots; static int display_remote; @@ -227,20 +228,6 @@ static QemuOptsList qemu_option_rom_opts = { }, }; -static QemuOptsList qemu_accel_opts = { - .name = "accel", - .implied_opt_name = "accel", - .head = QTAILQ_HEAD_INITIALIZER(qemu_accel_opts.head), - .desc = { - /* - * no elements => accept any - * sanity checking will happen later - * when setting accelerator properties - */ - { } - }, -}; - static QemuOptsList qemu_boot_opts = { .name = "boot-opts", .implied_opt_name = "order", @@ -1555,21 +1542,6 @@ static MachineClass *select_machine(QDict *qdict, Error **errp) return machine_class; } -static int object_parse_property_opt(Object *obj, - const char *name, const char *value, - const char *skip, Error **errp) -{ - if (g_str_equal(name, skip)) { - return 0; - } - - if (!object_property_parse(obj, name, value, errp)) { - return -1; - } - - return 0; -} - /* *Non*recursively replace underscores with dashes in QDict keys. */ static void keyval_dashify(QDict *qdict, Error **errp) { @@ -2025,7 +1997,8 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp) static bool is_qemuopts_group(const char *group) { if (g_str_equal(group, "object") || - g_str_equal(group, "machine")) { + g_str_equal(group, "machine") || + g_str_equal(group, "accel")) { return false; } return true; @@ -2039,6 +2012,8 @@ static GSList **qemu_config_list(const char *group) { if (g_str_equal(group, "object")) { return &object_opts_list; + } else if (g_str_equal(group, "accel")) { + return &accel_opts_list; } return NULL; } @@ -2177,22 +2152,20 @@ static int do_configure_icount(void *opaque, QemuOpts *opts, Error **errp) return 0; } -static int accelerator_set_property(void *opaque, - const char *name, const char *value, - Error **errp) -{ - return object_parse_property_opt(opaque, name, value, "accel", errp); -} - -static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp) +static void do_configure_accelerator(void *data, void *opaque) { bool *p_init_failed = opaque; - const char *acc = qemu_opt_get(opts, "accel"); + QDict *qdict = data; + const char *acc = qdict_get_try_str(qdict, "accel"); AccelClass *ac = accel_find(acc); AccelState *accel; int ret; bool qtest_with_kvm; + if (current_accel()) { + return; + } + qtest_with_kvm = g_str_equal(acc, "kvm") && qtest_chrdev != NULL; if (!ac) { @@ -2200,24 +2173,20 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp) if (!qtest_with_kvm) { error_report("invalid accelerator %s", acc); } - return 0; + return; } accel = ACCEL(object_new_with_class(OBJECT_CLASS(ac))); object_apply_compat_props(OBJECT(accel)); - qemu_opt_foreach(opts, accelerator_set_property, - accel, - &error_fatal); + qdict_del(qdict, "accel"); + object_set_properties_from_keyval(OBJECT(accel), qdict, &error_fatal); ret = accel_init_machine(accel, current_machine); if (ret < 0) { *p_init_failed = true; if (!qtest_with_kvm || ret != -ENOENT) { - error_report("failed to initialize %s: %s", acc, strerror(-ret)); + error_report("failed to initialize %s: %s", ac->name, strerror(-ret)); } - return 0; } - - return 1; } static void configure_accelerators(const char *progname) @@ -2227,7 +2196,7 @@ static void configure_accelerators(const char *progname) qemu_opts_foreach(qemu_find_opts("icount"), do_configure_icount, NULL, &error_fatal); - if (QTAILQ_EMPTY(&qemu_accel_opts.head)) { + if (!accel_opts_list) { char **accel_list, **tmp; if (accelerators == NULL) { @@ -2260,7 +2229,9 @@ static void configure_accelerators(const char *progname) * such as "-machine accel=tcg,,thread=single". */ if (accel_find(*tmp)) { - qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp, true); + QDict *qdict = qdict_new(); + qdict_put_str(qdict, "accel", *tmp); + accel_opts_list = g_slist_prepend(accel_opts_list, qdict); } else { init_failed = true; error_report("invalid accelerator %s", *tmp); @@ -2274,8 +2245,12 @@ static void configure_accelerators(const char *progname) } } - if (!qemu_opts_foreach(qemu_find_opts("accel"), - do_configure_accelerator, &init_failed, &error_fatal)) { + accel_opts_list = g_slist_reverse(accel_opts_list); + g_slist_foreach(accel_opts_list, + do_configure_accelerator, + &init_failed); + + if (!current_accel()) { if (!init_failed) { error_report("no accelerator found"); } @@ -2293,6 +2268,27 @@ static void configure_accelerators(const char *progname) } } +static void list_accelerators(void) +{ + printf("Accelerators supported in QEMU binary:\n"); + GSList *el, *accel_list = object_class_get_list(TYPE_ACCEL, + false); + for (el = accel_list; el; el = el->next) { + gchar *typename = g_strdup(object_class_get_name( + OBJECT_CLASS(el->data))); + /* omit qtest which is used for tests only */ + if (g_strcmp0(typename, ACCEL_CLASS_NAME("qtest")) && + g_str_has_suffix(typename, ACCEL_CLASS_SUFFIX)) { + gchar **optname = g_strsplit(typename, + ACCEL_CLASS_SUFFIX, 0); + printf("%s\n", optname[0]); + g_strfreev(optname); + } + g_free(typename); + } + g_slist_free(accel_list); +} + static void create_default_memdev(MachineState *ms, const char *path) { Object *obj; @@ -2591,7 +2587,7 @@ void qmp_x_exit_preconfig(Error **errp) void qemu_init(int argc, char **argv, char **envp) { QemuOpts *opts; - QemuOpts *icount_opts = NULL, *accel_opts = NULL; + QemuOpts *icount_opts = NULL; QemuOptsList *olist; int optind; const char *optarg; @@ -2615,7 +2611,6 @@ void qemu_init(int argc, char **argv, char **envp) qemu_add_opts(&qemu_trace_opts); qemu_plugin_add_opts(); qemu_add_opts(&qemu_option_rom_opts); - qemu_add_opts(&qemu_accel_opts); qemu_add_opts(&qemu_mem_opts); qemu_add_opts(&qemu_smp_opts); qemu_add_opts(&qemu_boot_opts); @@ -3165,30 +3160,21 @@ void qemu_init(int argc, char **argv, char **envp) break; } case QEMU_OPTION_accel: - accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"), - optarg, true); - optarg = qemu_opt_get(accel_opts, "accel"); - if (!optarg || is_help_option(optarg)) { - printf("Accelerators supported in QEMU binary:\n"); - GSList *el, *accel_list = object_class_get_list(TYPE_ACCEL, - false); - for (el = accel_list; el; el = el->next) { - gchar *typename = g_strdup(object_class_get_name( - OBJECT_CLASS(el->data))); - /* omit qtest which is used for tests only */ - if (g_strcmp0(typename, ACCEL_CLASS_NAME("qtest")) && - g_str_has_suffix(typename, ACCEL_CLASS_SUFFIX)) { - gchar **optname = g_strsplit(typename, - ACCEL_CLASS_SUFFIX, 0); - printf("%s\n", optname[0]); - g_strfreev(optname); + { + QDict *args; + bool help; + + args = keyval_parse(optarg, "accel", &help, &error_fatal); + if (help) { + const char *type = qdict_get_try_str(args, "accel"); + if (!type || !accel_print_class_properties(type)) { + list_accelerators(); } - g_free(typename); + exit(0); } - g_slist_free(accel_list); - exit(0); + qemu_record_config_group("accel", args, &error_abort); + break; } - break; case QEMU_OPTION_usb: qdict_put_str(machine_opts_dict, "usb", "on"); break; -- 2.26.2