Bandan Das <b...@redhat.com> writes:
> The helper function machine_iommu() isn't necesary. We can
> directly check for the property.
>
> Signed-off-by: Bandan Das <b...@redhat.com>
> ---
> hw/core/machine.c | 5 -----
> hw/pci-host/q35.c | 2 +-
> include/hw/boards.h | 1 -
> 3 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index f4db340..acca00d 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -462,11 +462,6 @@ bool machine_usb(MachineState *machine)
> return machine->usb;
> }
>
> -bool machine_iommu(MachineState *machine)
> -{
> - return machine->iommu;
> -}
> -
> bool machine_kernel_irqchip_allowed(MachineState *machine)
> {
> return machine->kernel_irqchip_allowed;
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index c81507d..1fb4707 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -506,7 +506,7 @@ static void mch_realize(PCIDevice *d, Error **errp)
> PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
> }
> /* Intel IOMMU (VT-d) */
> - if (machine_iommu(current_machine)) {
> + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) {
> mch_init_dmar(mch);
> }
> }
There's ample prededence for this technique.
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 3e9a92c..24eb6f0 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -33,7 +33,6 @@ MachineClass *find_default_machine(void);
> extern MachineState *current_machine;
>
> bool machine_usb(MachineState *machine);
> -bool machine_iommu(MachineState *machine);
> bool machine_kernel_irqchip_allowed(MachineState *machine);
> bool machine_kernel_irqchip_required(MachineState *machine);
> int machine_kvm_shadow_mem(MachineState *machine);
Reviewed-by: Markus Armbruster <arm...@redhat.com>
