]> git.proxmox.com Git - mirror_qemu.git/commit
machine: replace qemu opts with iommu property
authorMarcel Apfelbaum <marcel@redhat.com>
Wed, 4 Feb 2015 15:43:48 +0000 (17:43 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 11 Mar 2015 17:10:43 +0000 (18:10 +0100)
commit8caff63699a9bd6b82556bd527ff023c443ada2d
tree22b67cc3c74be83fedd1a450317474d2ebd775eb
parent5820945946b1e221905aa898f2cd97ed825acd47
machine: replace qemu opts with iommu property

Fixes a QEMU crash when passing iommu parameter in command line.
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 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 <marcel@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
hw/core/machine.c
hw/pci-host/q35.c
include/hw/boards.h