diff options
| author | Bandan Das <bsd@redhat.com> | 2015-11-13 01:55:47 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-11-17 15:41:13 +0200 |
| commit | 1f8431f42d833e8914f2d16ce4a49b7b72b90db0 (patch) | |
| tree | 180a1ce13a646b81b73a9b6a08b8c0bbe706849e | |
| parent | dc3db6adde329548771ab2addc2ef8376b2b8b32 (diff) | |
| download | focaccia-qemu-1f8431f42d833e8914f2d16ce4a49b7b72b90db0.tar.gz focaccia-qemu-1f8431f42d833e8914f2d16ce4a49b7b72b90db0.zip | |
q35: Check propery to determine if iommu is set
The helper function machine_iommu() isn't necesary. We can directly check for the property. Signed-off-by: Bandan Das <bsd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Bandan Das <bsd@redhat.com>
| -rw-r--r-- | hw/core/machine.c | 5 | ||||
| -rw-r--r-- | hw/pci-host/q35.c | 2 | ||||
| -rw-r--r-- | include/hw/boards.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index f4db340468..acca00db22 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 c81507d710..1fb470758b 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); } } diff --git a/include/hw/boards.h b/include/hw/boards.h index 3e9a92c055..24eb6f0e77 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); |