From nobody Tue Dec 16 07:06:21 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; dkim=fail; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520982499550576.9938773937338; Tue, 13 Mar 2018 16:08:19 -0700 (PDT) Received: from localhost ([::1]:43387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evt1k-0005sY-Ky for importer@patchew.org; Tue, 13 Mar 2018 19:08:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evshx-0005e3-3G for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evshu-00038p-GH for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:49 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:43554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evshu-00037T-99 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:46 -0400 Received: by mail-wr0-x244.google.com with SMTP id o1so2498868wro.10 for ; Tue, 13 Mar 2018 15:47:46 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kc0jPwGXta6m03/S0nr5VTOS83t4cEHXkNbqG4VHGnM=; b=rHmBcIA1d2L5F9dNjaP2QdtVtxIMpgTjsJIxtrnC70Uu18ggmsJ9uzoFvnoZ+o4i5I ugE1zgsQPY1x9fvaCbkueCXsFkanSr20gjO5ENmlapuPKpYp9jmRyqwyEJpR14k2MmVn OQc7/+kkemp+RAdfhuUgYJDi18p5HuVAXmOB4mNg3+ARHc/eyLKgeDB3gKS0udt75V4/ B2sIGlawF1p2/Kf5MQIs2b5ZWYxxrqtaDHow229FdRyYsvrfvCPU2UiKszQ0I4Vjk4rT fpt+9TVvfahvybgNA3hQwrdAszyPtiAxNlF2aqLnMlOokaWn5E5v/oNDg2pMaxyQ5k4r mXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kc0jPwGXta6m03/S0nr5VTOS83t4cEHXkNbqG4VHGnM=; b=FFjYHRjsVC6GIrpbWEenC81lI//qm2PeTFqQk3XqfNZa8OVXW02zK1lRoMJ64X/HEJ 5xjZDOGU2ivHeTlZvwZZhWW7WnxqUFubjl4bdY0HL0GGcFZzbg10vfBBLVUEJapna14V 0ufovLA9gcjZhNJfjRGMDRSFDVf7Jp2v62qYMQrEVg5Y5gQGPHhUtBU66ikgFT/SxIvr S6zl6tbUMczeK4P9Zi/FnUYoC6F4dKuq9m3gnWSRWCQFNOy/UUaUT0aeUyU+2B1Lt/nV IG/jh33fGxsJA1HV1tPjI+I+sAt1qHOnSuZV6+8VmNF3MbqiNlDLM6A7mA/YNZbBT8YJ 27FA== X-Gm-Message-State: AElRT7FeSjtijKvZqE8sntnmzzI4dcmX+NXeWGUckspE1GSA7s2HLKxa jQieNfl8XC3H1jbX7Q0j/XzG/4qZ X-Google-Smtp-Source: AG47ELuh4ygJzwaTgisHgavALTuMo5kpaz+B2V8GXQzJ5u6c893EGAw8CuFesNxzDUDXnOcz/XO+3A== X-Received: by 10.223.133.182 with SMTP id 51mr1798757wrt.226.1520981264830; Tue, 13 Mar 2018 15:47:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:29 +0100 Message-Id: <20180313224719.4954-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 19/69] 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Allow distributions to disable the Intel and/or AMD IOMMU devices. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 2 ++ hw/i386/Makefile.objs | 4 ++-- 3 files changed, 6 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..fa87a14152 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,8 +2,8 @@ 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-$(CONFIG_VTD) +=3D x86-iommu.o intel_iommu.o +obj-$(CONFIG_AMD_IOMMU) +=3D x86-iommu.o 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