>From 5d0308014bbee9b5753a8f432b3a751033b98458 Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Tue, 28 Jan 2014 11:17:09 +0800 Subject: [PATCH RFC 2/2] query-command-line-options: query all the options in qemu-options.hx vm_config_groups[] only contains part of the options which have parameters, and all options which have no parameter aren't added to vm_config_groups[]. Current query-command-line-options only checks options from vm_config_groups[], so some options will be lost. We have macro in qemu-options.hx to generate a table that contains all the options. This patch tries to query options from the table. Then we won't lose the legacy options that weren't added to vm_config_groups[] (eg: -vnc, -smbios). The options that have no parameter will also be returned (eg: -enable-fips) Some options that have parameters have a NULL desc list, some options don't have parameters, and "parameters" is mandatory in the past. So we add a new field "unspecified-parameters" to present if the option takes unspecified parameters. Some group names('smp-opts', 'boot-opts', 'acpi') of option tables don't match their actual command-line spelling, we will try to find the QemuOptsList by index. Signed-off-by: Amos Kong --- qapi-schema.json | 10 ++++++++-- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ vl.c | 19 ++----------------- 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 391356f..20fe4f5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4102,12 +4102,18 @@ # # @option: option name # -# @parameters: an array of @CommandLineParameterInfo +# @parameters: array of @CommandLineParameterInfo, possibly empty +# +# @unspecified-parameters: @optional present if the @parameters array is empty. +# If true, then the option takes unspecified +# parameters, if false, then the option takes no +# parameter (since 2.1) # # Since 1.5 ## { 'type': 'CommandLineOptionInfo', - 'data': { 'option': 'str', 'parameters': ['CommandLineParameterInfo'] } } + 'data': { 'option': 'str', 'parameters': ['CommandLineParameterInfo'], + '*unspecified-parameters': 'bool' } } ## # @query-command-line-options: diff --git a/qemu-options.h b/qemu-options.h index 89a009e..4024487 100644 --- a/qemu-options.h +++ b/qemu-options.h @@ -28,9 +28,21 @@ #ifndef _QEMU_OPTIONS_H_ #define _QEMU_OPTIONS_H_ +#include "sysemu/arch_init.h" + enum { #define QEMU_OPTIONS_GENERATE_ENUM #include "qemu-options-wrapper.h" }; +#define HAS_ARG 0x0001 + +typedef struct QEMUOption { + const char *name; + int flags; + int index; + uint32_t arch_mask; +} QEMUOption; + +extern const QEMUOption qemu_options[]; #endif diff --git a/util/qemu-config.c b/util/qemu-config.c index 877d0e9..29a6419 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -6,6 +6,14 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "qmp-commands.h" +#include "qemu-options.h" + +const QEMUOption qemu_options[] = { + { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, +#define QEMU_OPTIONS_GENERATE_OPTIONS +#include "qemu-options-wrapper.h" + { NULL }, +}; static QemuOptsList *vm_config_groups[32]; static QemuOptsList *drive_config_groups[4]; @@ -25,6 +33,19 @@ static QemuOptsList *find_list(QemuOptsList **lists, const char *group, return lists[i]; } +static QemuOptsList *find_list_by_index(QemuOptsList **lists, int index) +{ + int i; + + for (i = 0; lists[i] != NULL; i++) { + if (lists[i]->alias_index == index) { + break; + } + } + + return lists[i]; +} + QemuOptsList *qemu_find_opts(const char *group) { QemuOptsList *ret; @@ -137,18 +158,32 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, { CommandLineOptionInfoList *conf_list = NULL, *entry; CommandLineOptionInfo *info; + QemuOptsList *list; int i; - for (i = 0; vm_config_groups[i] != NULL; i++) { - if (!has_option || !strcmp(option, vm_config_groups[i]->name)) { + for (i = 0; qemu_options[i].name; i++) { + if (!has_option || !strcmp(option, qemu_options[i].name)) { info = g_malloc0(sizeof(*info)); - info->option = g_strdup(vm_config_groups[i]->name); - if (!strcmp("drive", vm_config_groups[i]->name)) { + info->option = g_strdup(qemu_options[i].name); + + if (!strcmp("drive", qemu_options[i].name)) { info->parameters = get_drive_infolist(); } else { - info->parameters = - get_param_info(vm_config_groups[i]->desc); + list = find_list_by_index(vm_config_groups, + qemu_options[i].index); + if (list == NULL) { + list = find_list(vm_config_groups, + qemu_options[i].name, + NULL); + } + info->parameters = list ? get_param_info(list->desc) : NULL; + } + + if (!info->parameters) { + info->has_unspecified_parameters = true; + info->unspecified_parameters = qemu_options[i].flags & HAS_ARG; } + entry = g_malloc0(sizeof(*entry)); entry->value = info; entry->next = conf_list; @@ -163,6 +198,8 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, return conf_list; } +#undef HAS_ARG + QemuOptsList *qemu_find_opts_err(const char *group, Error **errp) { return find_list(vm_config_groups, group, errp); diff --git a/vl.c b/vl.c index 6457d6d..9fdba9e 100644 --- a/vl.c +++ b/vl.c @@ -111,7 +111,6 @@ int main(int argc, char **argv) #include "trace/control.h" #include "qemu/queue.h" #include "sysemu/cpus.h" -#include "sysemu/arch_init.h" #include "qemu/osdep.h" #include "ui/qemu-spice.h" @@ -2080,22 +2079,6 @@ static void help(int exitcode) exit(exitcode); } -#define HAS_ARG 0x0001 - -typedef struct QEMUOption { - const char *name; - int flags; - int index; - uint32_t arch_mask; -} QEMUOption; - -static const QEMUOption qemu_options[] = { - { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, -#define QEMU_OPTIONS_GENERATE_OPTIONS -#include "qemu-options-wrapper.h" - { NULL }, -}; - static bool vga_available(void) { return object_class_by_name("VGA") || object_class_by_name("isa-vga"); @@ -2840,6 +2823,8 @@ static const QEMUOption *lookup_opt(int argc, char **argv, return popt; } +#undef HAS_ARG + static gpointer malloc_and_trace(gsize n_bytes) { void *ptr = malloc(n_bytes); -- 1.8.5.3