From nobody Fri Oct 24 09:56:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151981044405556.98992872055294; Wed, 28 Feb 2018 01:34:04 -0800 (PST) Received: from localhost ([::1]:43025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqy7T-00018I-Ng for importer@patchew.org; Wed, 28 Feb 2018 04:33:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqy6X-0000iA-3i for qemu-devel@nongnu.org; Wed, 28 Feb 2018 04:32:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqy6U-0007QW-08 for qemu-devel@nongnu.org; Wed, 28 Feb 2018 04:32:53 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55840 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqy6T-0007QA-SF for qemu-devel@nongnu.org; Wed, 28 Feb 2018 04:32:49 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E4DF402290A for ; Wed, 28 Feb 2018 09:32:39 +0000 (UTC) Received: from donizetti.redhat.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DF1B946B0; Wed, 28 Feb 2018 09:32:33 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 10:32:32 +0100 Message-Id: <20180228093232.24854-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 09:32:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 09:32:39 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] hw/i386: make IOMMUs configurable via default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ddepaula@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Allow distributions to disable the Intel and/or AMD IOMMU devices. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/i386-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 2 ++ hw/i386/Makefile.objs | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 3326e3e0bb..9e5a29fa4a 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -63,3 +63,5 @@ CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy +CONFIG_VTD=3Dy +CONFIG_AMD_IOMMU=3Dy diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-so= ftmmu.mak index 1c6cda1d9a..7baf91b921 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -63,3 +63,5 @@ CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy +CONFIG_VTD=3Dy +CONFIG_AMD_IOMMU=3Dy diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index fd279e7584..528b8dc431 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,8 +2,9 @@ obj-$(CONFIG_KVM) +=3D kvm/ obj-y +=3D multiboot.o obj-y +=3D pc.o pc_piix.o pc_q35.o obj-y +=3D pc_sysfw.o -obj-y +=3D x86-iommu.o intel_iommu.o -obj-y +=3D amd_iommu.o +obj-y +=3D x86-iommu.o +obj-$(CONFIG_VTD) +=3D x86-iommu.o intel_iommu.o +obj-$(CONFIG_AMD_IOMMU) +=3D amd_iommu.o obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ obj-$(CONFIG_VMPORT) +=3D vmport.o obj-$(CONFIG_VMMOUSE) +=3D vmmouse.o --=20 2.14.3