From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a30wX-0000mH-M5 for qemu-devel@nongnu.org; Sun, 29 Nov 2015 07:19:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a30wU-0004Gx-Ez for qemu-devel@nongnu.org; Sun, 29 Nov 2015 07:19:01 -0500 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:37450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a30wU-0004Gt-8B for qemu-devel@nongnu.org; Sun, 29 Nov 2015 07:18:58 -0500 Received: by wmww144 with SMTP id w144so105138815wmw.0 for ; Sun, 29 Nov 2015 04:18:57 -0800 (PST) References: <1447939696-28930-1-git-send-email-mst@redhat.com> <1447939696-28930-8-git-send-email-mst@redhat.com> From: Marcel Apfelbaum Message-ID: <565AED2E.4010404@gmail.com> Date: Sun, 29 Nov 2015 14:18:54 +0200 MIME-Version: 1.0 In-Reply-To: <1447939696-28930-8-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 07/15] q35: Check propery to determine if iommu is set Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: Peter Maydell , Bandan Das On 11/19/2015 03:36 PM, Michael S. Tsirkin wrote: > From: Bandan Das > > The helper function machine_iommu() isn't necesary. We can > directly check for the property. > > Signed-off-by: Bandan Das > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Michael S. Tsirkin > Signed-off-by: Bandan Das > --- > 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)) { Maybe is too late, but this contradicts QEMU usage, as I understand object_property_get_* should be used when we don't know object's type. Why use "iommu" when you can simply call current_machine->iommu ? (if you don't like the wrapper, which is pretty harmless in my opinion) Thanks, Marcel > mch_init_dmar(mch); > } > } >