Re: [Qemu-devel] [PATCH V2 for-2.3] util/qemu-config: fix regression of qmp_query_command_line_options

[Marcel Apfelbaum]

On 04/01/2015 07:47 PM, Marcel Apfelbaum wrote:
> Commit 49d2e64 (machine: remove qemu_machine_opts global list)
> made machine options specific to machine sub-type, leaving
> the qemu_machine_opts desc array empty. Sadly this is the place
> qmp_query_command_line_options is looking for supported options.
>
> As a fix for for 2.3 the machine_qemu_opts (the generic ones)
> are restored only for qemu-config scope.
> We need to find a better fix for 2.4.
>
> Reported-by: Tony Krowiak <address@hidden>
> Signed-off-by: Marcel Apfelbaum <address@hidden>
Added Eric Blake to CC list.

> ---
> v1->v2:
>   Addressed Eric Blake's and Markus Armbruster's comments:
>   - Left only generic options (and not the per-machine options) in 
> machine_qemu_opts.
>   - Corrected some spelling errors.
>
>   util/qemu-config.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 81 insertions(+)
>
> diff --git a/util/qemu-config.c b/util/qemu-config.c
> index f3463df..2d32ce7 100644
> --- a/util/qemu-config.c
> +++ b/util/qemu-config.c
> @@ -6,6 +6,7 @@
>   #include "hw/qdev.h"
>   #include "qapi/error.h"
>   #include "qmp-commands.h"
> +#include "hw/i386/pc.h"
>
>   static QemuOptsList *vm_config_groups[32];
>   static QemuOptsList *drive_config_groups[4];
> @@ -148,6 +149,84 @@ static CommandLineParameterInfoList 
> *get_drive_infolist(void)
>       return head;
>   }
>
> +/* restore machine options that are now machine's properties */
> +static QemuOptsList machine_opts = {
> +    .merge_lists = true,
> +    .head = QTAILQ_HEAD_INITIALIZER(machine_opts.head),
> +    .desc = {
> +        {
> +            .name = "type",
> +            .type = QEMU_OPT_STRING,
> +            .help = "emulated machine"
> +        },{
> +            .name = "accel",
> +            .type = QEMU_OPT_STRING,
> +            .help = "accelerator list",
> +        },{
> +            .name = "kernel_irqchip",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "use KVM in-kernel irqchip",
> +        },{
> +            .name = "kvm_shadow_mem",
> +            .type = QEMU_OPT_SIZE,
> +            .help = "KVM shadow MMU size",
> +        },{
> +            .name = "kernel",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Linux kernel image file",
> +        },{
> +            .name = "initrd",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Linux initial ramdisk file",
> +        },{
> +            .name = "append",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Linux kernel command line",
> +        },{
> +            .name = "dtb",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Linux kernel device tree file",
> +        },{
> +            .name = "dumpdtb",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Dump current dtb to a file and quit",
> +        },{
> +            .name = "phandle_start",
> +            .type = QEMU_OPT_NUMBER,
> +            .help = "The first phandle ID we may generate dynamically",
> +        },{
> +            .name = "dt_compatible",
> +            .type = QEMU_OPT_STRING,
> +            .help = "Overrides the \"compatible\" property of the dt root 
> node",
> +        },{
> +            .name = "dump-guest-core",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "Include guest memory in  a core dump",
> +        },{
> +            .name = "mem-merge",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "enable/disable memory merge support",
> +        },{
> +            .name = "usb",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "Set on/off to enable/disable usb",
> +        },{
> +            .name = "firmware",
> +            .type = QEMU_OPT_STRING,
> +            .help = "firmware image",
> +        },{
> +            .name = "iommu",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "Set on/off to enable/disable Intel IOMMU (VT-d)",
> +        },{
> +            .name = "suppress-vmdesc",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "Set on to disable self-describing migration",
> +        },
> +        { /* End of list */ }
> +    }
> +};
> +
>   CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option,
>                                                             const char *option,
>                                                             Error **errp)
> @@ -162,6 +241,8 @@ CommandLineOptionInfoList 
> *qmp_query_command_line_options(bool has_option,
>               info->option = g_strdup(vm_config_groups[i]->name);
>               if (!strcmp("drive", vm_config_groups[i]->name)) {
>                   info->parameters = get_drive_infolist();
> +            } else if (!strcmp("machine", vm_config_groups[i]->name)) {
> +                info->parameters = query_option_descs(machine_opts.desc);
>               } else {
>                   info->parameters =
>                       query_option_descs(vm_config_groups[i]->desc);