From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwigx-0000UA-Nv for qemu-devel@nongnu.org; Wed, 11 Nov 2015 22:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwigh-0002YO-HN for qemu-devel@nongnu.org; Wed, 11 Nov 2015 22:36:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwigh-0002YA-Bw for qemu-devel@nongnu.org; Wed, 11 Nov 2015 22:36:39 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 8BEC78E75F for ; Thu, 12 Nov 2015 03:36:38 +0000 (UTC) From: Bandan Das Date: Wed, 11 Nov 2015 22:36:15 -0500 Message-Id: <1447299376-21252-2-git-send-email-bsd@redhat.com> In-Reply-To: <1447299376-21252-1-git-send-email-bsd@redhat.com> References: <1447299376-21252-1-git-send-email-bsd@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] q35: Check propery to determine if iommu is set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bandan Das , mst@redhat.com The helper function machine_iommu() isn't necesary. We can directly check for the property. Signed-off-by: Bandan Das --- 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); } } 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); -- 2.6.1