Received: from eggs.gnu.org ([2001:4830:134:3::10]:49617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyhJB-0001FX-ED for qemu-devel@nongnu.org; Tue, 17 Nov 2015 09:32:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyhJ8-0003Aq-8K for qemu-devel@nongnu.org; Tue, 17 Nov 2015 09:32:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyhJ8-0003AR-3K for qemu-devel@nongnu.org; Tue, 17 Nov 2015 09:32:30 -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 7F20133E5FA for ; Tue, 17 Nov 2015 14:32:28 +0000 (UTC) From: Markus Armbruster References: <1447397748-24920-1-git-send-email-bsd@redhat.com> <1447397748-24920-2-git-send-email-bsd@redhat.com> Date: Tue, 17 Nov 2015 15:32:25 +0100 In-Reply-To: <1447397748-24920-2-git-send-email-bsd@redhat.com> (Bandan Das's message of "Fri, 13 Nov 2015 01:55:47 -0500") Message-ID: <8737w4r91i.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v3 1/2] q35: Check propery to determine if iommu is set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bandan Das Cc: qemu-devel@nongnu.org, mst@redhat.com Bandan Das writes: > 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); > } > } 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