Re: [Qemu-devel] [PATCH 1/8] machine: query iommu machine property rather than qemu opts

[Marcel Apfelbaum]

On 02/04/2015 05:43 PM, Marcel Apfelbaum wrote:
> Fixes a QEMU crash when passing iommu parameter in command line.
>
> Signed-off-by: Marcel Apfelbaum <address@hidden>

Please amend commit message:

Running
    x86_64-softmmu/qemu-system-x86_64 -machine pc,iommu=on -enable-kvm
leads to crash:
    qemu-system-x86_64: qemu/util/qemu-option.c:387: qemu_opt_get_bool_helper: Assertion 
`opt->desc && opt->desc->type == QEMU_OPT_BOOL' failed.
    Aborted (core dumped)

This happens because the commit e79d5a6 ("machine: remove qemu_machine_opts global 
list")
removed the global option descriptions and moved them to MachineState's QOM 
properties.

Fix this by querying machine properties through designated wrappers.

Signed-off-by: Marcel Apfelbaum <address@hidden>


> ---
>   hw/core/machine.c   | 5 +++++
>   hw/pci-host/q35.c   | 2 +-
>   include/hw/boards.h | 1 +
>   3 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index fbd91be..096eb10 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -403,6 +403,11 @@ bool machine_usb(MachineState *machine)
>       return machine->usb;
>   }
>
> +bool machine_iommu(MachineState *machine)
> +{
> +    return machine->iommu;
> +}
> +
>   static const TypeInfo machine_info = {
>       .name = TYPE_MACHINE,
>       .parent = TYPE_OBJECT,
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index b20bad8..dfd8bbf 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -415,7 +415,7 @@ static int mch_init(PCIDevice *d)
>                    PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
>       }
>       /* Intel IOMMU (VT-d) */
> -    if (qemu_opt_get_bool(qemu_get_machine_opts(), "iommu", false)) {
> +    if (machine_iommu(current_machine)) {
>           mch_init_dmar(mch);
>       }
>       return 0;
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 3ddc449..a12f041 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -66,6 +66,7 @@ MachineClass *find_default_machine(void);
>   extern MachineState *current_machine;
>
>   bool machine_usb(MachineState *machine);
> +bool machine_iommu(MachineState *machine);
>
>   /**
>    * MachineClass: