From patchwork Thu Nov 12 22:55:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bandan Das X-Patchwork-Id: 543727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 19DE4141434 for ; Fri, 13 Nov 2015 09:56:58 +1100 (AEDT) Received: from localhost ([::1]:50163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx0nY-0006E6-9T for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2015 17:56:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx0nA-0005dY-J0 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 17:56:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zx0n9-0007nP-Kf for qemu-devel@nongnu.org; Thu, 12 Nov 2015 17:56:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx0n9-0007n1-Ff for qemu-devel@nongnu.org; Thu, 12 Nov 2015 17:56:31 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 2359CAEF38 for ; Thu, 12 Nov 2015 22:56:31 +0000 (UTC) Received: from aqua.redhat.com (ovpn-113-187.phx2.redhat.com [10.3.113.187]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tACMuEZ9013665; Thu, 12 Nov 2015 17:56:29 -0500 From: Bandan Das To: qemu-devel@nongnu.org Date: Thu, 12 Nov 2015 17:55:48 -0500 Message-Id: <1447368949-15312-2-git-send-email-bsd@redhat.com> In-Reply-To: <1447368949-15312-1-git-send-email-bsd@redhat.com> References: <1447368949-15312-1-git-send-email-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Bandan Das , armbru@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 1/2] q35: Check propery to determine if iommu is set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);