From patchwork Fri Mar 7 18:03:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 871229 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp895765wri; Fri, 7 Mar 2025 10:07:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWWiSQb+yxewkZSEVWvUFMrbOaA739LruTHYlJ9cvjut7RDpppcKMBF+UJuEZhE3t3RAxAPGQ==@linaro.org X-Google-Smtp-Source: AGHT+IFzcLfJR6O7UTxR5UoOwDTVLZFeZpvwgHmfitkuUXLyucYnlmNCofixfjFqowImNKymeklR X-Received: by 2002:a05:6214:f62:b0:6e4:2198:12fe with SMTP id 6a1803df08f44-6e907d3ec3bmr7841486d6.18.1741370865792; Fri, 07 Mar 2025 10:07:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741370865; cv=none; d=google.com; s=arc-20240605; b=D3Znfy7hX5AQQow/MSepEE18NIaKS7uwOoymGHo+sa0ryAPSqn+m+wGl2ombSD+pxe X3cS2iPnKW8rUn2v/fXUC8ZJmSsi2skqEwPvzEglownVEmaBsS4hh3kbpF7Mp7XGYycP UhqX8UP5v4/a7ZJASCDzFO4u9lIc4K7MGT4eEjgFdoQqviWGX4QQjC0VzQbCYVDvqMvL fbyWSyZYRgYs4NdiaxtJfL35LGq/LRVfOAkJ9oaTOKh4SI+jzddl27dbBe8vAJRozJ8M PFncEHzkQf6Hlhy++VL//kRWRFo0YOS2BmjO5ZJG/sG3CTj1MJUg4SlXNaFORwMFveni dGJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TEveCyP6FEOPe2OjJI8iFRo9o4gmTgwH3d2sFhPvDtA=; fh=ZyzqLhNGJAXkYZjVqygzIY1NON/Kumlz+Vm/jUj6bQE=; b=c7WFtiwaOkS6uAwSaVbiyZZ+qSt7kugbBzBvGggIO6xkX482yOOsMskc6D/XiBsN78 iAoD9zxfckvSqQNWwySoF/f0Qc30Sb6LpR+NX7NEVXYY4S5CVLp7v1NPwlqqOPAh9LMG i557taLg29ID/8klIGfjnqZvTO1z82wiZsaanZA5f4COB8XM/OwqYyB4mqihLfZSXhWb lkFF3Jj/ThW7dG+i1VfOSiP1SPGx56F+0FBMQ+H6DiJtZOaXeROaO/cjqZFo/v0mIGVN GMl6WvN76oOxfow/hVevYJSfGpWnwxjkTpKB2PeRMvRw0ccwkaRYs2pEa7DbvoTkyJ3U mJ8A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lcGun/IU"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8f716291asi37313636d6.224.2025.03.07.10.07.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 10:07:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lcGun/IU"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqc3g-00042v-2W; Fri, 07 Mar 2025 13:04:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqc3Y-0003pE-Jg for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:04:22 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqc3Q-0002BX-Ga for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:04:15 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39129fc51f8so1881144f8f.0 for ; Fri, 07 Mar 2025 10:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741370647; x=1741975447; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TEveCyP6FEOPe2OjJI8iFRo9o4gmTgwH3d2sFhPvDtA=; b=lcGun/IUTR6VQs6MSI/befSpFGMUccPGOYgfkcp3BdMkkfAZdibD929fPJghSjNpqi xXzKjOUBEsCXa4nI8m6Kjz45zCYttEU3KavNhYVGVOhFoqMZj8ffDnzusShkT8YkWcmI yRVEpQVgjqB2jR5UlnAfY7Q5UfAFFQqL1FSXB2PB/rKIbrJqQ5r88SKh9ft8DD4LmPNZ uuJsOWefHcamkLdzqaMv9/gFdo0Xa7kjibXGRHw268IypX6M8ksDFHzH7WRIpNC8x7Xc MxcbaLGVNlMgIiGBR3r9JMrnD/Df4utMoc6Oh3Hpoz7R42sygmWR2Lt1l8lNP/4jjiZJ phsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741370647; x=1741975447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TEveCyP6FEOPe2OjJI8iFRo9o4gmTgwH3d2sFhPvDtA=; b=oX1Azg8OZ6W788wcQLMCJU/tSNlz7EJSj/bBPyR1VSD9qGRBEbIcTBZolcL3KE4XBu RVKUc8tsRdBr/ZtHPS0AGkm/73Gym9KXEhXFDtEeQO6GWJBlRh0DyYsOktko0O1QKemn +3/OKvOzUt+NWDs4ywBWK3ZTbNx5KjNtws5jCbVmIsBuJNMYbcD5nkfIOHYVhwKEsFI7 LeimJESqKOn45Q7CuJKv/XKWa0C1jyFpMsJQD2jkfa4hZRwRzge2vitn5kiEDrXobdWs qnqzfxVEjoSbbIzlPRFiFg4kotIZMvy6i+xnz/ZYgUpV3zJiUupTFtfFtiyV76PZfsTD OQcw== X-Gm-Message-State: AOJu0Yx1dowq6krnk4rP14aDn0ZlFtT+/odMANaKubtYWipvdZNXJ3XV nu6RzF04qW7Hs7Lx+FxlcQDPK2zKyv5b418JzFg73tTwiE+5odR0Z+xb3MgWW6zHDHeJvyWl+f6 SbjM= X-Gm-Gg: ASbGncsEIK/NWf4Jrv+09OtjM6R8w+IKNz8KJGq1859PEy+7RQ52bdbgucAFoZyZYPh wv0BWWS1QGEIcypafryr6297ZBK5b/LVl4wgAMibRGy8yw9lPnxJrKt4kW6SbWRvmaSJnJy+jpZ 6kvqB+UZ7BbPaZc7oNCs7wd93eJr3e4s0utwqWZ+JoiEhpl23+9OJGxUWnt5fbC12z+6+WaSvKS y79qKwCbO0ORVw9P1ezMRcStvAVAd6BhPWtVYfMUk92Abz8HACou7OeDLVTQ7gYxAzVgMn3piyG bpZUwsUvLbTdq1VCiBDlfcCIQ6qPJcCZ1IxmPWDe2HzKnnW/iMoIjNew8zbAw3OjVxLvAzCaVDV mdMSJNYpiDRByyt1Pia4= X-Received: by 2002:a5d:64cd:0:b0:391:2995:5ef2 with SMTP id ffacd0b85a97d-39132dace0fmr2665116f8f.37.1741370647439; Fri, 07 Mar 2025 10:04:07 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01d81csm6127965f8f.58.2025.03.07.10.04.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 10:04:06 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alex Williamson , Igor Mammedov , qemu-ppc@nongnu.org, Thomas Huth , Richard Henderson , Tony Krowiak , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Yi Liu , Paolo Bonzini , Zhenzhong Duan , Matthew Rosato , Eric Farman , Peter Xu , Pierrick Bouvier , Daniel Henrique Barboza , Eric Auger , qemu-s390x@nongnu.org, Jason Herne , =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , Harsh Prateek Bora , Nicholas Piggin , Halil Pasic , Christian Borntraeger Subject: [PATCH 05/14] hw/vfio: Compile iommufd.c once Date: Fri, 7 Mar 2025 19:03:28 +0100 Message-ID: <20250307180337.14811-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307180337.14811-1-philmd@linaro.org> References: <20250307180337.14811-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Removing unused "exec/ram_addr.h" header allow to compile iommufd.c once for all targets. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/iommufd.c | 1 - hw/vfio/meson.build | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index df61edffc08..42c8412bbf5 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -25,7 +25,6 @@ #include "qemu/cutils.h" #include "qemu/chardev_open.h" #include "pci.h" -#include "exec/ram_addr.h" static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 2972c6ff8de..fea6dbe88cd 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,9 +4,6 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( - 'iommufd.c', -)) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', 'pci-quirks.c', @@ -28,3 +25,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'migration-multifd.c', 'cpr.c', )) +system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( + 'iommufd.c', +))