[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/15] q35: Check propery to determine if iommu is se
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/15] q35: Check propery to determine if iommu is set |
Date: |
Thu, 19 Nov 2015 15:36:18 +0200 |
From: Bandan Das <address@hidden>
The helper function machine_iommu() isn't necesary. We can
directly check for the property.
Signed-off-by: Bandan Das <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Bandan Das <address@hidden>
---
include/hw/boards.h | 1 -
hw/core/machine.c | 5 -----
hw/pci-host/q35.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
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);
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);
}
}
--
MST
- [Qemu-devel] [PULL 00/15] vhost, pc: fixes for 2.5, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 01/15] vhost: let SET_VRING_ENABLE message depends on protocol feature, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 02/15] vhost: don't send RESET_OWNER at stop, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 03/15] vhost-user: update spec description, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 04/15] vhost-user-test: support VHOST_USER_SET_VRING_ENABLE, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 06/15] vhost-user: start/stop all rings, Michael S. Tsirkin, 2015/11/19
- [Qemu-devel] [PULL 07/15] q35: Check propery to determine if iommu is set,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 08/15] i440fx: print an error message if user tries to enable iommu, Michael S. Tsirkin, 2015/11/19