| Message ID | 1393868508-21236-3-git-send-email-akong@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03/03/2014 10:41 AM, Amos Kong wrote: s/PCTCH/PATCH/ in the subject, although it doesn't affect patch application. > vm_config_groups[] only contains part of the options which have > argument, and all options which have no argument isn't added to s/isn't/aren't/ > vm_config_groups[]. Current query-command-line-options only > checkes options from vm_config_groups[], so some options will s/checkes/checks/ > be lost. > > We have some macros 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 lost the legacy options that weren't added to s/lost/lose/ > vm_config_groups[]. The options have no argument will also be s/have/that have/ > returned (eg: -enable-fips) > > Some options that have argument have a NULL desc list, some > options don't have argument, and "parameters" is mandatory > in the past. So we add a new field "arguments" to present > if the option takes unspecified arguments. > > Signed-off-by: Amos Kong <akong@redhat.com> > --- > qapi-schema.json | 8 ++++++-- > util/qemu-config.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ > 2 files changed, 52 insertions(+), 8 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 05ced9d..0bd8e12 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -3944,12 +3944,16 @@ > # > # @option: option name > # > -# @parameters: an array of @CommandLineParameterInfo > +# @parameters: array of @CommandLineParameterInfo, possibly empty > +# @argument: @optional present if the @parameters array is empty. If > +# true, then the option takes unspecified arguments, if > +# false, then the option is merely a boolean flag (since 2.0) I like it. > > +#define HAS_ARG 0x0001 > + > +typedef struct QEMUOption { > + const char *name; > + int flags; > + int index; > + uint32_t arch_mask; Where is arch_mask used by this patch? > +} QEMUOption; > + > CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, > const char *option, > Error **errp) > @@ -139,15 +161,33 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, > CommandLineOptionInfo *info; > int i; > > - for (i = 0; vm_config_groups[i] != NULL; i++) { > - if (!has_option || !strcmp(option, vm_config_groups[i]->name)) { > + static const QEMUOption qemu_options[] = { > + { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, > +#define QEMU_OPTIONS_GENERATE_OPTIONS > +#include "qemu-options-wrapper.h" > + { NULL }, > + }; This looks identical to what is already in vl.c. Why do we need two static tables with identical contents? Can't you just export the existing table and have it just once?
On Mon, Mar 03, 2014 at 05:37:57PM -0700, Eric Blake wrote: > > --- > > qapi-schema.json | 8 ++++++-- > > util/qemu-config.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ > > 2 files changed, 52 insertions(+), 8 deletions(-) > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > index 05ced9d..0bd8e12 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -3944,12 +3944,16 @@ > > # > > # @option: option name > > # > > -# @parameters: an array of @CommandLineParameterInfo > > +# @parameters: array of @CommandLineParameterInfo, possibly empty > > +# @argument: @optional present if the @parameters array is empty. If > > +# true, then the option takes unspecified arguments, if > > +# false, then the option is merely a boolean flag (since 2.0) > > I like it. > > > > > +#define HAS_ARG 0x0001 > > + > > +typedef struct QEMUOption { > > + const char *name; > > + int flags; > > + int index; > > + uint32_t arch_mask; > > Where is arch_mask used by this patch? We want to re-use existed Macro QEMU_OPTIONS_GENERATE_OPTIONS. > > +} QEMUOption; > > + > > CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, > > const char *option, > > Error **errp) > > @@ -139,15 +161,33 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, > > CommandLineOptionInfo *info; > > int i; > > > > - for (i = 0; vm_config_groups[i] != NULL; i++) { > > - if (!has_option || !strcmp(option, vm_config_groups[i]->name)) { > > + static const QEMUOption qemu_options[] = { > > + { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, > > +#define QEMU_OPTIONS_GENERATE_OPTIONS > > +#include "qemu-options-wrapper.h" > > + { NULL }, > > + }; > > This looks identical to what is already in vl.c. Why do we need two > static tables with identical contents? Can't you just export the > existing table and have it just once? Ok. I will export the qemu_options table to qemu-options.h > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org >
diff --git a/qapi-schema.json b/qapi-schema.json index 05ced9d..0bd8e12 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3944,12 +3944,16 @@ # # @option: option name # -# @parameters: an array of @CommandLineParameterInfo +# @parameters: array of @CommandLineParameterInfo, possibly empty +# @argument: @optional present if the @parameters array is empty. If +# true, then the option takes unspecified arguments, if +# false, then the option is merely a boolean flag (since 2.0) # # Since 1.5 ## { 'type': 'CommandLineOptionInfo', - 'data': { 'option': 'str', 'parameters': ['CommandLineParameterInfo'] } } + 'data': { 'option': 'str', 'parameters': ['CommandLineParameterInfo'], + '*argument': 'bool' } } ## # @query-command-line-options: diff --git a/util/qemu-config.c b/util/qemu-config.c index d624d92..c9c8732 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -6,6 +6,8 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "qmp-commands.h" +#include "sysemu/arch_init.h" +#include "qemu-options.h" static QemuOptsList *vm_config_groups[32]; static QemuOptsList *drive_config_groups[4]; @@ -78,6 +80,17 @@ static CommandLineParameterInfoList *get_param_infolist(const QemuOptDesc *desc) return param_list; } +static int get_group_index(const char *name) +{ + int i; + + for (i = 0; vm_config_groups[i] != NULL; i++) { + if (!strcmp(vm_config_groups[i]->name, name)) { + return i; + } + } + return -1; +} /* remove repeated entry from the info list */ static void cleanup_infolist(CommandLineParameterInfoList *head) { @@ -131,6 +144,15 @@ static CommandLineParameterInfoList *get_drive_infolist(void) return head; } +#define HAS_ARG 0x0001 + +typedef struct QEMUOption { + const char *name; + int flags; + int index; + uint32_t arch_mask; +} QEMUOption; + CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, const char *option, Error **errp) @@ -139,15 +161,33 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, CommandLineOptionInfo *info; int i; - for (i = 0; vm_config_groups[i] != NULL; i++) { - if (!has_option || !strcmp(option, vm_config_groups[i]->name)) { + static const QEMUOption qemu_options[] = { + { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, +#define QEMU_OPTIONS_GENERATE_OPTIONS +#include "qemu-options-wrapper.h" + { NULL }, + }; + + 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); + + int idx = get_group_index(qemu_options[i].name); + + if (qemu_options[i].flags) { + info->argument = true; + } + + if (!strcmp("drive", qemu_options[i].name)) { info->parameters = get_drive_infolist(); - } else { + } else if (idx >= 0) { info->parameters = - get_param_infolist(vm_config_groups[i]->desc); + get_param_infolist(vm_config_groups[idx]->desc); + } + + if (!info->parameters) { + info->has_argument = true; } entry = g_malloc0(sizeof(*entry)); entry->value = info;
vm_config_groups[] only contains part of the options which have argument, and all options which have no argument isn't added to vm_config_groups[]. Current query-command-line-options only checkes options from vm_config_groups[], so some options will be lost. We have some macros 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 lost the legacy options that weren't added to vm_config_groups[]. The options have no argument will also be returned (eg: -enable-fips) Some options that have argument have a NULL desc list, some options don't have argument, and "parameters" is mandatory in the past. So we add a new field "arguments" to present if the option takes unspecified arguments. Signed-off-by: Amos Kong <akong@redhat.com> --- qapi-schema.json | 8 ++++++-- util/qemu-config.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 52 insertions(+), 8 deletions(-)