From patchwork Sat Mar 8 23:08:57 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: 14007969 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05714C2FA for ; Sat, 8 Mar 2025 23:09:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475369; cv=none; b=OdY8idiD3nnZwerBnG/DYYJS/fmwgNvmR1j82QjIJoSQ0rkAGXia5BNtBS0OmUNA/+0gL4qkzB2EtjW2SHRKR5Y1pmw1hNmFndXl+ma51cjy1Ajn+Bd3UdKQFVcIf03TzzEutX22PgLCf8Ybv10Bez+Vtzmhs6bmUoG+8zIw/7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475369; c=relaxed/simple; bh=F+ZRtaTij26jduiPWk0rWAIbayT52I5DJ8DhJzphAuM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tPj0gXJZ5BBBM79tlrVfSK+O+3UsBeL7rQACA0+KkZNv/UOgPnbYKargTcwx+ZqirAN3uwxlPohBH9/Ah/u9hdiq0HpUsqmUyxYhNWIUHbQ171+2g1CnOSL1eajvM/fHDJ+iJ4sMEllqaZA8wXEqEbOBTshIG1NH89aYlOn26Zw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=V5mgZfrY; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="V5mgZfrY" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43bd45e4d91so17609795e9.1 for ; Sat, 08 Mar 2025 15:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475366; x=1742080166; darn=vger.kernel.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=Qxj25K64APubIeBFvAOvHKODmgZUFRmHVHXhc1AU81U=; b=V5mgZfrYKf60ULQa5pP1R2nlsTl70/I7Udyn9ICrYZ+TjpPdvY/9faukqZc8rET6XR mfD9htMoKYSYTWJzY3na5Hc8ETO6J7Okdpe/wFFmDlkXGgcqRE0o5ETLnNLs2q3zm2iT 6wq/ckcrAZTnW4CJ81KZUB58/6DXP2X73bPqDH5JUkmZyPno2aJ4hcvPZsfSYOIc7x1P yYVAcXnN93Gf5h8s2T2hbQslvOU2QQnsdxvkAOAZROWHe8GhBN43WJr1p5wCNH+Rc5SW MPDHCGNhTfFwfSchVVfdLEE/JKshjBLiSwfKasfS1qYZ4+i7NEVlcHhE/ZWglbQsadRn yS3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475366; x=1742080166; 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=Qxj25K64APubIeBFvAOvHKODmgZUFRmHVHXhc1AU81U=; b=rvSoXfupwjnwJcOB/yap+Fxck6YVLY3DXvBMQdnMZfS8ziu2c5JtEYbqRo8d+dM+1M TO9kD5xArv+ekpxusHP8251u+rniEZwshpjpixQYpeuUEkQTWwXWwA2xTTQgzzcif9mT J4TdVttFaIABEqZB6gZ+qZIJsAmjgpIzO9JXgTQP5EEHCMi5WE8kb6dXABsWVW/XKlYf Sl4wukULEtWZ2/o9bf2tc/Rmkn6H5i8BC57fsl9BAKFXBidtvm+rWc+aUl5rltBws6Lq XgdxvpQ+CxVuRtD5H9NnYH5L2fqr3LrWBylD02zc/ooZRnEq2kqAhiaIaZ2jesOOeJVF jjvw== X-Forwarded-Encrypted: i=1; AJvYcCVmnyi/WlFk3G0IjTnk7vmXMrupIJTEo75TrN51QbqKBgfmpK5Nv0ZnCEPTppuuKscPNMU=@vger.kernel.org X-Gm-Message-State: AOJu0YyVUnXBebc6PoJOSVDRZKBAdjybAvwPWmfbmUnleNpX2H0m5PgF YsC7Tkk5pnK6oFxEwfCy8i2bcXpCdYs6Z06ry/LhaV8YaiKCFN+V2nK7n+FPCUc= X-Gm-Gg: ASbGncsjFMiIN06mOCVWuHkabjuE0UtSMvOmClaEoDf5+SZ0oep2qTDfCAotpAlbcxN rRURAYLWQYkc0LFZ2zFX8pP3dh0wnzT0W33slvFcxKCbgfCQpWdGetA8m4mteoqdBF6lqVMPiVW 2+0d+Kk7amdhEGvcnX6Z/lIG3vFx/zRLPVR0FKCDKBIOVOliYRVwe9grG1LyZf2yDlQsOwxhjg+ ybwECF9ElNMpb0JYj0tWLtGxcRXAjgWMlDIwOqTvI4OcGS7zbFEdapuip/uhmBdhiD4A2HpWGii kkhr762otKdDjqJirSyqp93MY3k5EDR0ur7NyrywPDy/l1GN8JTiUvFu9O3u4d6Pw14vT3cl5de Ln2ELdqRlKiromCnMArg= X-Google-Smtp-Source: AGHT+IHJ0NS/FfGXlmf4jylNvapCrpoM4pkS8c5smWzHWxpj3jWgC5iW6aWgueYm5DZwov9rUe2K1w== X-Received: by 2002:a7b:ca53:0:b0:43b:dcc8:557c with SMTP id 5b1f17b1804b1-43ce4dd640fmr29552115e9.13.1741475366165; Sat, 08 Mar 2025 15:09:26 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c324csm96428385e9.12.2025.03.08.15.09.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 01/21] hw/vfio/common: Include missing 'system/tcg.h' header Date: Sun, 9 Mar 2025 00:08:57 +0100 Message-ID: <20250308230917.18907-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Always include necessary headers explicitly, to avoid when refactoring unrelated ones: hw/vfio/common.c:1176:45: error: implicit declaration of function ‘tcg_enabled’; 1176 | tcg_enabled() ? DIRTY_CLIENTS_ALL : | ^~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 7a4010ef4ee..b1596b6bf64 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -42,6 +42,7 @@ #include "migration/misc.h" #include "migration/blocker.h" #include "migration/qemu-file.h" +#include "system/tcg.h" #include "system/tpm.h" VFIODeviceList vfio_device_list = From patchwork Sat Mar 8 23:08:58 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: 14007970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1006C2FA for ; Sat, 8 Mar 2025 23:09:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475376; cv=none; b=sn2j2AC/JXaGYCuUMGsZvMtpGMo+uG71giGeFIXF+fDN0Gorvr6qtZ0vCMDwuJ7S+04Wh82GX8LI0sNSateFi3nVWO8dY5tMlL0zGmrUBxU/PIdmS84oqB9sYJb4QL65s3BHCth1bxaLbQfk8xO9qM7wungcmmjxq1f3LfFzgfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475376; c=relaxed/simple; bh=AInv2ScCWeturStaBsdVLk2o0m6S6PvKzCLYtxZiLQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L7hF6SWP/rm+YbDSgM/ZEVaWWhZyPX74PbEXqn9qFfyddRMqm1cWe1mKlqgCQIpmK/MGpoRO3ZdmWZ1xR5GGP+RrNPfBjVuG2M36Cg6FOLhZ4QY9pyU09u+cxdYI/3osCyfAZEkhM7GWOJFkBMolgu1UHkGQJnThBKYpo2Bzp30= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=lFb16e0A; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="lFb16e0A" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-391211ea598so1794674f8f.1 for ; Sat, 08 Mar 2025 15:09:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475373; x=1742080173; darn=vger.kernel.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=UiYDGY0x4W7ov/VJy7EJQHs//caAqbf3NrfbrKDB/Hc=; b=lFb16e0A58nCRt6ly5YrPAdcOuy6/vJClVEDHe+/5BibMHBe9uWxHkApIQHC/IeLcX uDyuuXPZbp8/dWvJ+vyFvtfax2F5/fpl9eZ0WuK9BcPzvbQi7hpwlYpPWUgSKQGtQOwV 8YkDTevN4jlz0MpIT8s5wSN92mzhGgTt3ceIMVwqeklaa4OVgRL4SGgDHk46RsWvG4qO 81c1SvUF0J6zVmsFw/sj6svgDrKbMniBWcM02mGftcHyI5ja/viiGJx7vbNJm/E5q4JV 69mCkkQXbOVmOgof2nkSI86DR+PzHR/QIRledEiEqLSN4c+FalmN8IZP7KUOatyhdJP3 x+fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475373; x=1742080173; 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=UiYDGY0x4W7ov/VJy7EJQHs//caAqbf3NrfbrKDB/Hc=; b=Zc+423DzBwmMtv1sMAr0gf+l7O9pnvF1pxr0GmHla0nRkZABl8IV9C4QlZVGzKaOJ8 wiasoeQtKzhNArlWhQNWHMsIcjBxmumXe1kwp9OQaQ0S8N6g7P/w1n2ULxy3CIFrsnuX 8veweERM21kqe4xHZzdrBVHap2MZwaHhZc0v96YmgbNx0lP5OX+yHiA7qyD4Jwn31IVW gnyfEQ/UyPW8sjPgfiIa8EbrekdkDtuO5ysFcjhmX45U3wZslHoPWTK5LG43zAGcZgL5 OFR2WzEhaejhP8igu9i4H3QzdR9nCKJhr7RxOZPEfj9hV4vSkroJNRUq+wjnyC8og1lH MfBg== X-Forwarded-Encrypted: i=1; AJvYcCVqSXkH/cy3HGmUYQq+b7AIWkyfqHkkDsMU/eV9DoATn+8TwRsRMHX4/Udl5jXO6r+xALw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0FP4bN1qnvk8kTPeMrfJ18mbg8ieojKvlCH50iA6Dx0ZZQhNn /7/dDJ1VVuzpzRwOeU8Q8kXnI/lsWFymTfxGuKFt1MHOG3Zf/LjLxX5tN1OGnqc= X-Gm-Gg: ASbGncvGVuNsZQIsF0yK4Cnc/YLbPFO55FkMp2kyciJsF1XE1HUAqFI8RUBSJHWdfSI O88J9Ao6+Cw0h2PUoo8LgGUG33DCC6y1FRqWZMO3swwtOj16kpCJdZyeaXCSVdorleP6K6G9gLb wCGfp37kKJymjKvT/5lbmchKXwfR9ECh24XXua0eCVjhwPAU27gjftPg6qXXgi2m/3xW0CNQsMp IVVH3MIHeVzDMjlQamIMYXQ+siqyaX0y+K7n3J3StDHm04IVaT7d0YUeDSR5VBg7M/OFxardLkA WVQF0dyTmr3dm+WhLpuJtJJMiJe0/k88qmJ8gttS9mFVZVnj/DX8h32eduWOMPOJnCR90DBeWTi m4lDCl7Sk2T54eDoJlng= X-Google-Smtp-Source: AGHT+IHYMJqZoHstkmUTso6ugEbg70sSuamLLXL2p0kaDugCZceiL2gWbQnBjC91i2JahXaPJtswDA== X-Received: by 2002:a5d:5f8f:0:b0:391:2e0f:efec with SMTP id ffacd0b85a97d-39132d1faebmr5173255f8f.7.1741475373036; Sat, 08 Mar 2025 15:09:33 -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-3912bfe0004sm9859574f8f.40.2025.03.08.15.09.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 02/21] hw/vfio/spapr: Do not include Date: Sun, 9 Mar 2025 00:08:58 +0100 Message-ID: <20250308230917.18907-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 is already include by "system/kvm.h" in the next line. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/spapr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index ad4c499eafe..9b5ad05bb1c 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -11,9 +11,6 @@ #include "qemu/osdep.h" #include #include -#ifdef CONFIG_KVM -#include -#endif #include "system/kvm.h" #include "exec/address-spaces.h" From patchwork Sat Mar 8 23:08:59 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: 14007971 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34F141F584B for ; Sat, 8 Mar 2025 23:09:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475382; cv=none; b=b+Pz+dp/ey0ig4oOKnjznWT5A4I2jpt+jLy/CKX9anVSfZ7Jad26aST/9OOvBK73gQNIfPF60tv7FfDAm1hlpIOM8BRc6lF0Jc7EIWulyAKGrO+TKAgSzRrjgWo0jphDiBDSYLBH96FXXEjr128dY61HY8L8ASDccj87stpjMck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475382; c=relaxed/simple; bh=kC6TRwPJU8pcisC+kwrbFny6G8hHIGGNWh5b3/4nNF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JrHRCo/PsnGr9SadUiZ7D303a/ku5dH91Ve7xC8jxPZ/fjYR/8D+rhgYOX/6XGBES1rmYV9hE1qU/8RN9GsNiMKEQqeG2m8g6iR32KTl//my7DignG5hAyl3Szg0B0U0IeoIITOyoEEI4XM5Awb52f1beX7Q7U66QOY7IMk4iag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=FEUhmu3u; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="FEUhmu3u" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3913d129c1aso402833f8f.0 for ; Sat, 08 Mar 2025 15:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475378; x=1742080178; darn=vger.kernel.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=C4sOyyLdHZ94t1nFvB4a0FIi/FlAkRfDFcAkUZmK1lY=; b=FEUhmu3uIG845ve6zRBEnvihlfZL4VC1CUBb3zZBBAt5E8dr4ctgnB8oqlLCkEDxqO l+/6aI7ediLCsNRBz3GRQ+cGqsl0CatYeTHMfB9Zv/AyH9gjLNT6QfsJq6Wq6iIiKZVg zAqPAjfXHGyz2gog8V1IOvIdf2yoLxE4mwTOzjaZ5WEJmGvfjpoL+BU+VfiIJA2+aCFw Q2+3TOL5EyGzp7FQPyoPUVNxj+8Dy+G6WwspQK7Wi/MQEX5MDwc1VYFxAfz0K2uPiVB0 ny2j0xIWaCC2WbYdYNkvE8RJqu+0RQXaXucUsr9jIDneTq11Clk+1PzvyuhN0U7g1vfe 4xjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475378; x=1742080178; 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=C4sOyyLdHZ94t1nFvB4a0FIi/FlAkRfDFcAkUZmK1lY=; b=YRSCiBjikLNQfichONyb7tYXuiRFBHmMZKZCuSExiL6YvoCFqifv4tLUVa/y01XT/q N0Hi56S20dEdYg3GRwg5aah5Qz4ZfhcE9VM+gnjN9+JbIleCtSHE/melMo6ChOcvkx2+ 72e90QJwkg46tb9eTjq+fUKUKaHHN2Pm0PLzPY3aLubpkb3SV4zIP2H5fs5U6nN0m1K2 /SjdVBFJnGQzT6B+i6uaHIi91VZLAcQZpfrqsPocgLwlTG/lYQXi4m9xRQkLbgPf5Pj1 iaTrwf9cTzJdpjV/WqyLZFE7/TDA0R8pjjQFykBVhskslDAXVhTaq9tTWLyXTFF1+Dwd UYEw== X-Forwarded-Encrypted: i=1; AJvYcCWEnnvjGpsKn07Gwi3MDqiKGYrX0C6KYATcWE4t31j0QOU2NDhJrYtyU7/+hpYGGF+yfYs=@vger.kernel.org X-Gm-Message-State: AOJu0YynxJSTokD+4a18O5yuSfQn1+P09PGj4qxuYYzOXo1fbSpqX92N LA0drh61HrHUb93c0cmvorQVp29gQPubzvdI/mVestKtI2VBNuEQmSddQESf2kQ= X-Gm-Gg: ASbGnctkYoQgKklk6gDgWYqwAuJAgrK43UfiIH0d27oEpFIUM/QsIjXQ8hU++nRmnLO DscYBf1aJcKpM8I145RVvTwUhkiYhZ2Ndj9ZoZDJncHl4f3bZJCwsgt8rOLbl12MOchfL1ZMGFR W+7ZaZH8D7MyUPQUM5zgDoteAPUmLlSyFvxPJsGEIwyHchL6gpxkhhtZUYmQofTzlyF4nMsurkg IUuK8AUlCMq2pbnjY9IqcOtpDX6TrUHzbIRXijmySJ5dOP4gkYrbc1B2jwaZYP7OI1kltkem8V2 Th2jlm3/SYNH+4OjUlA5it3udWNj1MOU/gXkRMK3TV3m9AdicKn684kYIB60JtWVXyQEBG2ccYf y2rdMxB7bI3djGUojLFY= X-Google-Smtp-Source: AGHT+IEw95hLpQ6L7aoWgp/bxwK/ZuUh6EVLZGte6tf2yrptaAeFh+yTGwJkxhI0K8AnTcsOHslqpg== X-Received: by 2002:a05:6000:1a86:b0:391:a74:d7e2 with SMTP id ffacd0b85a97d-3913af390eemr2446915f8f.26.1741475378455; Sat, 08 Mar 2025 15:09:38 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cf27f8ef3sm2422605e9.11.2025.03.08.15.09.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 03/21] hw/vfio: Compile some common objects once Date: Sun, 9 Mar 2025 00:08:59 +0100 Message-ID: <20250308230917.18907-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some files don't rely on any target-specific knowledge and can be compiled once: - helpers.c - container-base.c - migration.c (removing unnecessary "exec/ram_addr.h") - migration-multifd.c - cpr.c Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/migration.c | 1 - hw/vfio/meson.build | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 416643ddd69..fbff46cfc35 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-vfio.h" #include "exec/ramlist.h" -#include "exec/ram_addr.h" #include "pci.h" #include "trace.h" #include "hw/hw.h" diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 260d65febd6..8e376cfcbf8 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -1,12 +1,7 @@ vfio_ss = ss.source_set() vfio_ss.add(files( - 'helpers.c', 'common.c', - 'container-base.c', 'container.c', - 'migration.c', - 'migration-multifd.c', - 'cpr.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_IOMMUFD', if_true: files( @@ -25,3 +20,11 @@ vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) + +system_ss.add(when: 'CONFIG_VFIO', if_true: files( + 'helpers.c', + 'container-base.c', + 'migration.c', + 'migration-multifd.c', + 'cpr.c', +)) From patchwork Sat Mar 8 23:09:00 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: 14007972 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A0361B5ED1 for ; Sat, 8 Mar 2025 23:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475388; cv=none; b=DHj6R8pnjEXr5w/rFZVEHpd5VirZLJNUhuRneIvPFUf5F+EMnSXzX6IE7scP9iPgrfN9oGHS6wkjLN7SCKuEcBkP+WXGQ7PkX3wgk2UR9/iyNf5x9fZy3gd8mSgh9APe6fGMgOHkGLUjjuQwdxV/tLHdMJGhx4fmFBkFaIdW6/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475388; c=relaxed/simple; bh=7JifOsK56KLXEupAFHYKaU8TlwNPNllK8RLo4I69V2Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nXjVLOHpr1YP0pp1SIh20hQZwqF5xeXcWlnGaVB70sIlEeQXk2zx0NClMWTxXw/6oeQWt3VFGSP94oosqgHWSBcZb02HyZTdkLeKXUUJA/1K+NDpmSJcQpDCENGZsTdY2VqW9hg9nSs4eAWEV7GFUxwwIiToIgehYNabBuCAWVA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JMLX5BpL; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JMLX5BpL" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3913fdd0120so217172f8f.0 for ; Sat, 08 Mar 2025 15:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475385; x=1742080185; darn=vger.kernel.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=+FKsUbwnAskeU+PqgxhKuYVFxrph8Le8+j4owi767as=; b=JMLX5BpL4wrq1LDd80qiFwg1hXdIKnYjskk1ez5qwHeO34LXr3bw4gKrMHu9p7A1an pTG9HmnyrB9o9jec2ku7N41MJ8p00o/BS332Tru914SHnF3Qdioi2iNBz9R1dn6g9D4d 5d2wpG9diQs2ZVxNogCFk9mg9TVcVBMm+JrrY8nViEwwMTCAjfel/E8rzJqzp+iDNJP1 hh3aE7w8VXixXwelfkh08YJWMI6XyNS6ByBs/8h7iYEPJhs1F0kzE86g4zNgBy/or1LO MNdKKcBZ7NY5EJgng8Hr8j7dDZYjHBBnlF8ae3JHN6pcedHt9sJkl2W3h93D9ahVwUtX rM6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475385; x=1742080185; 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=+FKsUbwnAskeU+PqgxhKuYVFxrph8Le8+j4owi767as=; b=MPUgIgHd6TMoyXyTVkm3sCixvxnLWu+dNd+vL03ZLCPM2c0ASrXga3XNbZJxalvEco QMb/OZ1/vHeV2mB6pAPi9VeH9tLDaXzyOw/QitshBlytZv5OQyztmjQzzi9cp0M1Ybf9 ilbqADRG9xhO35bMTrDULqCwARY2yDgxKYHVLqDgoL2rpMWk+s02/wig8TQEgedjCTLM QorFAWhKkBu8repA1my072nHwEZAFoybQlNtT0kJoD9Wtdfj+8LjaVVczLXk1dpmI+ti GFqUy8q7QPVJ/XpH4fbdsv6MqcOYbKHvOEj7AcElfsdG6OO3EfxuwyIteP18EQOFkJ/p oE+A== X-Forwarded-Encrypted: i=1; AJvYcCX6AUfEUxQIszmtuXmDFtVp4R/l9T+DiVj114x5YMpChVsKoYeOJuHm+ne32f2drbK/G0w=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvw42cbBN47BMxzErDKGtuIO9aUDK/7IHOkgDvJvHPm1qgyOJB Itqj7KFgpYX0LztiRg6B5AmQAZshiSV19955th3F51WBbvMUXXcxQplawI+b3sE= X-Gm-Gg: ASbGncu2tukWXlSuclx97h5ZAh/QUye3t0tO5rfeLJPDmkHBL0MUNg8juJBpEWKRDS8 68Vp1Z5jdpMHI2yNWj/G/G4lRzg7HvOxMcLtG1UAUUPiv927Om7UE8+0jyDfPkXhdO5FXGqwzJI lrZsq6AJLdGfme2KdsxvkjlOZvitvJ2Wlmao1WkqgoxKbwttzMJDtEGwOUs+CcIhN68zstDhDBx izp4lQy7YtFgMBRIijAJHdwdI1x6ogCX1YHPGhekOrZZl5hsyFWQq6osY7l/5IuHL0zciDV8DH9 vxzNhAvwLL7wwNWV66EAEi1VS3gtOpASoFliDstyNfdspuHK5zjkf9ReVcpg1pJaDi+WlWp4KtU fevyL1uyirRUEW+9BUT4= X-Google-Smtp-Source: AGHT+IHZofeaDr/4fSpqwbHx3ixE1QtBXdjQPdOMSMcK4b64SZHfONsqYlwQPdKO1yfi+jQf0ZSJlA== X-Received: by 2002:a05:6000:144d:b0:391:2e58:f085 with SMTP id ffacd0b85a97d-39132dab192mr5125015f8f.54.1741475385293; Sat, 08 Mar 2025 15:09:45 -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-3912bfdfde7sm10273156f8f.32.2025.03.08.15.09.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 04/21] hw/vfio: Compile more objects once Date: Sun, 9 Mar 2025 00:09:00 +0100 Message-ID: <20250308230917.18907-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 These files depend on the VFIO symbol in their Kconfig definition. They don't rely on target specific definitions, move them to system_ss[] to build them once. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 8e376cfcbf8..784eae4b559 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -14,13 +14,13 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( )) vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) -vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) -vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) +system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) +system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'helpers.c', 'container-base.c', From patchwork Sat Mar 8 23:09:01 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: 14007973 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DD8220F06D for ; Sat, 8 Mar 2025 23:09:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475394; cv=none; b=b3IFq5/5bYNfRNuRPyhluQUoqbvMqOd8/octdMzOJwVZcg0L+VltjFOV/MoT5+DoX1Gi+Bb/lf4f+AtbQ+5oosVl2msSwUWo2CIyTpx6sOddOn38pnKEro5E2XINcV+eZPRcTwvejosrXjTITc1W01PeeWXcj7WujeHiJ4XQuB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475394; c=relaxed/simple; bh=yXs/LQSQE4OqjK8HsPlzJMOG1v9dx8mt7k/gx8R+/TE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XemHxFiIP9i64EcIS+hX3fQQ72ty5Bd1ym2o8ickE7SA8YkUtx+DPoq8dli04Qbfhgz0XU7xI6UnC9/9+Rj3FcmbOYNWSgdmuUp1cW3A6xkhzwYumLIqFWEG+M/ECzgmvk++jaY1b2FoGYGpDTz/rnAthqK9fT7y3XEA7y2MQcQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=f+wMa2qG; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="f+wMa2qG" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso1438715e9.2 for ; Sat, 08 Mar 2025 15:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475391; x=1742080191; darn=vger.kernel.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=mLqJv5GFiMdqC5SzSdRzdt+1VdUICrsHDhSI3tGgwd0=; b=f+wMa2qGhN6yFyd0GOwQiweN0LBf3BfZcsB0Qge/CFnnS3hLoyaD0KzxYYQfDEs1Ya kRXTjifMSK7jA0KFUPTi+Q++UE1cbtiGw7lPhqLPl6RoaYGw5MkZB6X0nNOzlpgIUduf TZiEx/xtxcM90SKkcb1ddOUqEFl/KO2GKdCpU1ClIVY8f2JsUGWG9dgwwTGuTot+daxr 4dsN2rXPY3c6/+C3YxSBD3oI1GN+zgK5IEhC4q0A6pnG8DsUuuFPi+bOyP83KHYzNPt4 zWTMk5TCdofoi0lhNJty/psHPkGIbrkq6xxesqRcaX63pGn3F2KnfnHINnp/jn6ptlVE QGxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475391; x=1742080191; 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=mLqJv5GFiMdqC5SzSdRzdt+1VdUICrsHDhSI3tGgwd0=; b=URNYGZvt4vTeYok4FATqVqLsA5rWo84l3HQzFMnDsdRm5kZNx3u3Ic1PsydxPV9dsH m8ENm60WWzwDtFvnaNJwE6FP77gkD1tOAJjgBfyGj6U12V2xPESBdqcaQkWaoSj92DJQ hwXCCbzoR+mRYQXaBARkfkQpFhQAsBflwZRt4U2w7z47Ehr1R1vIcaM/DLuF+WeN4vrP hKT4ycmybVpLFx48gFbicmJXnd0Ykf8u5T7ZkNhN4TnZUmvk4qTTXsLidj2hMv7E6Y4v 3nwXNdcEhN6DxzvruR6zlif3zFC4WaWTbWbbKc2dEhwrAjQzTYuvIofaR1QR2xK2KDWv NseQ== X-Forwarded-Encrypted: i=1; AJvYcCXdazO1tUOgXDxy5WWcJWLP2mPMosywavzkqysm2MamJt/h5WzbYvH/nnbOCzEfK3UndD8=@vger.kernel.org X-Gm-Message-State: AOJu0YwrHp3UNxprhGTtQbUB7ToOjjBxzWVC/LGmJYWVjGgEXhq7m7w3 X67QPhenDqz8CqTLZCSOogLEkMT7bi4sfc3F/5Ct0BoI5osYKnUqJaQNUpqSFJo= X-Gm-Gg: ASbGnct2r0eLxIeSMFgHjuTFt/srEV1sf2vQqDy8Pp+Gxk+iBD0gLXB+KnQlCbSrQJK sSCD9WG7bo9oSU3Et+x3cDofpAOEG2ugMkJimMvvJxcd16TM7wJumTGAKWzVwf/25p5n+qy6AfO qKv+gSzuJp6DqVnHg7R9Ci8FRXp9mp3UyRJCTrZs0vA5372cFeEERyqNfUd9vu/Tr65+yE+/vXj MV2uvD+j7yTN0ks98XrhBSxEDK9p4AHiR0t5XL7NSDF5EogAOd3AWYoT4yydvZmSlpYclcmcQny GjhSvG5hSD9RPu6hwfokfF2cMPfOKRct9Fax/mavzCiCKDce+YTgIe2kDYWNUBx2xRLvIVppxZ7 5FbmXaRiZ+tK5bfVSbbI= X-Google-Smtp-Source: AGHT+IFoLK+xqCwbE74i/YFIgsjJ7Nm/q7qXKgEmlP4DidAEt6Fl8aqw1QkG8mrCX5ar2z4veKXWag== X-Received: by 2002:a5d:648f:0:b0:38c:2745:2df3 with SMTP id ffacd0b85a97d-39132da24bfmr7412108f8f.37.1741475391309; Sat, 08 Mar 2025 15:09:51 -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-3912c102e01sm10299396f8f.93.2025.03.08.15.09.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 05/21] hw/vfio: Compile iommufd.c once Date: Sun, 9 Mar 2025 00:09:01 +0100 Message-ID: <20250308230917.18907-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 784eae4b559..5c9ec7e8971 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', +)) From patchwork Sat Mar 8 23:09:02 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: 14007974 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57181C2FA for ; Sat, 8 Mar 2025 23:09:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475400; cv=none; b=JzgDbn7qCgDti1lBS4t/6juZovwnTh0e809zO8P0orVSWgpZBP+QZz7MZ+V6HwVZS5M2spbAZlYQ61ytNuenqpOs+RUwZMtY5o9vMq6U2DvtDJjF61j2oIPIAAlCew+XYDAg63Ax7iVOEaL6WrpnDcl9Fq/yJZBSA45G3UkZUwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475400; c=relaxed/simple; bh=H8Jdo813l2emcZDHgUTUtanp32FnR3rq9PY/Qi/t+iE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GEBHKnKI2kkZDefiAFfmJwX0BLzQQWJ3LGpukTSVMv2g0cgUtIeuMVhFtWmU1VslgHZmfA5MX/orx0EshdeCLp5KzYo09hfy+iEmJaYgtyS6/ugAcHqgAxadRbVJunTS6H5cEjV8+gv+/5OvirN5tq8clv4NIkO1rzm3Tj8jhQo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SJYNYLnW; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SJYNYLnW" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3913b539aabso418815f8f.2 for ; Sat, 08 Mar 2025 15:09:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475397; x=1742080197; darn=vger.kernel.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=QNAZPNsyTlqo2tLPWvhBvh59TFVcvzQjUjnLojvYJaQ=; b=SJYNYLnWgoPW2Z+Wd49+TH7ra5JvfMrWTrSw6eVCcfdQzh0LKGMAq5O3rG3PLO5hW+ fvc+vCPEbujO1GuhwOnP47AWepe3QXS/ZBObTnpTFB+FSz35b44t6/v/xjlRUB98nTMu Oi5d4TlH4dLcKVepsX3rSVwrgDSpAVWs8EuqelI+xzSRDsr+84LgqxOvipr8d5IOis2J /OrAE+15X5FYM0WwW9dkq0ZdQdRyH5ch1kMJ8OrVK+IHAaSkr4O/gt2dr8vAPDliEuYM iBJq2mHf2hRsUgKx7jTZDR+CrLo22sgE+02cvNuj62sSbnEX8sATo7AVu/PZeRmuuOLA V3pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475397; x=1742080197; 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=QNAZPNsyTlqo2tLPWvhBvh59TFVcvzQjUjnLojvYJaQ=; b=B6Sd6Rl7AcC9qOTwIzzDGShbnssm3BPZifNAV6VcNrmq20hOAa7vBb+hxNHFPZPDrH dFhEIkqqAhguxXxZQvPvmgMsbaP0wSRrYklLa1Uti2J7FZru1y+rxPgGe9FStYaYZ8aF 0WskjQNm8u+lGZhpLbOfCyczIkHT6lGrC/jYB3p2A6z4GD1wDRBC0+QzD6dSOpuzXpuU k3yqf0rFo8vQh+ZQBUCdg5I2i+aL9qdhJ0ranrVwNCuBIbJ+YOq/PUGAGDS//bSrC8F+ J0d4gP2WSw3P5s9jn21pmPGnqVp63Qxh5qiIqvPAf1nuQxmmXyjAvgcBqt1yxfpbjmWV X9EQ== X-Forwarded-Encrypted: i=1; AJvYcCVVuhep8lgJpxHcWiQGIvNb3gC3+uGEhBHv1rKHiA7yl7+mODzuZkrt2KWhD6LwpmWDxrI=@vger.kernel.org X-Gm-Message-State: AOJu0YyyHOXBgLlo0TAdgHONp7AraV24PgM+V0bNZeU44lcSirHAGyBE 6ZHSbF5Qtd2KR132Uc5/l9MQApCQE8ZIU1eq8qzZlymOtdJOJfJ2EPOi13bFgMI= X-Gm-Gg: ASbGncuDUernZFhrursNrmJHrUQ7eW4OV89KrX4trEjiwfcnTzH83vm/xgqNOm7NrvJ Lfs8hOKh+eNSz14Q5A4djYmsTuj+LmcddjFC+oRZkIM5Zcr1A7i1InSMFeH12U1cY84uY2Ncvah +Ce5Ecpn65hcAONKYsx6YskyF2jXup7TQ1PxCc7lgijc7uttNZ29V051YtYVzeyhAY2kJ8Ifjgb TbfqU2dzbRCQG2ycHCHNtSTGDc/vCBohFJmvsWS/euK5TmitBW0x8PTCnUgbTZ11RDf9WVfnupC VyDZD0EsJFIYUgtoTvJW5OSlbLukue4b8bTY2gghF/gZXY8nhrrPDhKluEBOnZNPK4swh2IEg/6 B6Bkl39VqN0oOEGd0faM= X-Google-Smtp-Source: AGHT+IG8MQrKfOJU0WoQHCAOd6Oq6wQcj1JZv9hwm7SxDKuTpUWDCbRgEKRZFOWkkDK4Q+3TnMf+nw== X-Received: by 2002:adf:a1c7:0:b0:391:4095:49b7 with SMTP id ffacd0b85a97d-39140954a39mr1073805f8f.25.1741475396652; Sat, 08 Mar 2025 15:09:56 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd426c33asm132242055e9.3.2025.03.08.15.09.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:09:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 06/21] system: Declare qemu_[min/max]rampagesize() in 'system/hostmem.h' Date: Sun, 9 Mar 2025 00:09:02 +0100 Message-ID: <20250308230917.18907-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Both qemu_minrampagesize() and qemu_maxrampagesize() are related to host memory backends, having the following call stack: qemu_minrampagesize() -> find_min_backend_pagesize() -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND) qemu_maxrampagesize() -> find_max_backend_pagesize() -> object_dynamic_cast(obj, TYPE_MEMORY_BACKEND) Having TYPE_MEMORY_BACKEND defined in "system/hostmem.h": include/system/hostmem.h:23:#define TYPE_MEMORY_BACKEND "memory-backend" Move their prototype declaration to "system/hostmem.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 --- include/system/hostmem.h | 3 +++ hw/ppc/spapr_caps.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/vfio/spapr.c | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 94bb3ccbe42..ccc8df561af 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -101,9 +101,6 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr, bool ramblock_is_pmem(RAMBlock *rb); -long qemu_minrampagesize(void); -long qemu_maxrampagesize(void); - /** * qemu_ram_alloc_from_file, * qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing diff --git a/include/system/hostmem.h b/include/system/hostmem.h index 5c21ca55c01..62642e602ca 100644 --- a/include/system/hostmem.h +++ b/include/system/hostmem.h @@ -93,4 +93,7 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend); size_t host_memory_backend_pagesize(HostMemoryBackend *memdev); char *host_memory_backend_get_name(HostMemoryBackend *backend); +long qemu_minrampagesize(void); +long qemu_maxrampagesize(void); + #endif diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 904bff87ce1..9e53d0c1fd1 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -34,6 +34,7 @@ #include "kvm_ppc.h" #include "migration/vmstate.h" #include "system/tcg.h" +#include "system/hostmem.h" #include "hw/ppc/spapr.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 51ae0c133d8..1261d93b7ce 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -41,6 +41,7 @@ #include "hw/s390x/tod.h" #include "system/system.h" #include "system/cpus.h" +#include "system/hostmem.h" #include "target/s390x/kvm/pv.h" #include "migration/blocker.h" #include "qapi/visitor.h" diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 9b5ad05bb1c..1a5d1611f2c 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -12,6 +12,7 @@ #include #include #include "system/kvm.h" +#include "system/hostmem.h" #include "exec/address-spaces.h" #include "hw/vfio/vfio-common.h" From patchwork Sat Mar 8 23:09:03 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: 14007975 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B02431E834F for ; Sat, 8 Mar 2025 23:10:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475405; cv=none; b=Zpd5DyclOz2/FAwa8YVU4KE/RnFt9WZHyGXsbb6THeUozf9MswjixvhHnjIOfMu2PWvKkrL8dTKQAAZmPzovsDNOLXMqJz3iB7+r/mXGNUNvX0pABW8cORbnBUBCyuEZhtfrkFof3NUZ1SLlz5UCwVPmTxY5lujuEW49BFHsxUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475405; c=relaxed/simple; bh=8npzkivAWWPNhdOG/zEbE5ZkHLXi7SW/1OvnJiI6da0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fPB0DXCgVVL7iHGfB07Stv/3I2M0sUhlw4DfeoYQNbuu8OCWggOF7ioEqTRQ0K7Bt9OskGu5Nft46tadvAz/YJOlZiyNR0mm737qidTBHNSdbYHrumb4JA/zySvS77fwgk9xks2TMa4ua0fHFV/sTd3NcUzV+MNvE9Brl5DOp8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=uadGRkOa; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uadGRkOa" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43bdc607c3fso17911705e9.3 for ; Sat, 08 Mar 2025 15:10:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475402; x=1742080202; darn=vger.kernel.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=+FGFHz50rlwowjsXAPUzEIGbHAi/y/Zg2M+gRe6JQAc=; b=uadGRkOaEyKrTW2yds3MEUZn7y5/OA7xPNS5DGKw8yrdxDeMBivS4q94ulxDLHQSbc ktr1+F4vShqLQG/QyRWCTiOCC7htsxxffvwkLE5Oov46V/67XxikzPm5sgFQKO9ZxgNA h7kHHN/g/u9hKG31a9/TlqZ1LewEWCwwOiubxT2qrye0CyfvUWuQa9lb9ckdSWXp/gxe TXG/PSzN5YWLJoeq6x+F8BQpB+DDgxyBPwUe57JvdIYf4nB1yB0mpVg1+2NCsN6WQ73+ TbZyiE14CEfga/dlFurH/c/VDVeuWIYwC6SHcTARmKlK/kv5OAS8TRAEmPgES+HN/pz6 Qsiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475402; x=1742080202; 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=+FGFHz50rlwowjsXAPUzEIGbHAi/y/Zg2M+gRe6JQAc=; b=SSYtcNqI1QyMrq7+kc76l8wNMZnxZwXkAe7EUFUNFXIFAFpQSimNI9oOSuSu6exeF6 Js3g4J4ERcGUk58g+gKoO9yar/thgBKbnpyULo3xuY27QnfDk5Wb6brOL1/L5lceBDUQ loHj/Vqc0eSBIoI3QiwnETpyh4b+KFKY6EN1vTnpx3sO9Rh3hzxZd9rC3n4Sg97tC+V1 Sw+cOmCEMPiT8wEC93JQomPeoYMVNEN1CVqEc0ncho/VjP4FPzQj2ztESLatmoDYWj4Q gk9tye/I11HbMpWOE11XpekWXaNlVKVnc25RRgR5vSGYnM9hWLy5ALX0rueuUmLCkyAK nYjA== X-Forwarded-Encrypted: i=1; AJvYcCXTPPoBcAAD/GFiukUm2oGqNQSZIytMkPwYNkegDadvvGAAGn8Tv5Ekmab59X0Du3ROaP0=@vger.kernel.org X-Gm-Message-State: AOJu0YwWph3+KABwh1Z2GDVb5MPEgXWhu16MR/+sxRKzCLyaV2ceT/7V fonfPsMIHOe2xPUEMvBtKzaPSmoShF3fXW4z4KLA4rStbjJfyNhaZG3PLEhDCZQ= X-Gm-Gg: ASbGncuIhVeqIzQT1VlAQuFZpu1qacoHN5tCRdgsc6Tb7hyKpgN6UmoLNrlTbbocDIB ASe1FH45m5TYixzQ8NxzemABkO54uaUPg4pMUB4XcDwAVYKQ/QBdOqP5RJBQ5BfZP3hxbvRmC0Z Sfeco6bOYwsDVluqXTFqMAu6tcdRTf+KqRhXO8Jri6xogp6L5caS5aq2h7QTN24l7vk4+LhAoHA 7rVFV3quRVpj3uIl9FvmH4YhdOB6/OJ+/Ij09U70GYLJBwIZeSFDpphkVARB+kmISl5ie6Dw03E HwRPWM7dYY5iFLx6HpZ05DLVGzc7kMBtWTflZzJxwRNIHFQfZDICPrrHq9Wka7QlYi0rQMCeggp YH3zSy6ZRQaY1TBSy2YMOQTfUe7/Xnw== X-Google-Smtp-Source: AGHT+IGIv7r4JVSN4fyIj3wYPXDmIoomS2e7/C3qLiVhv6Ql0EEJlV/5Due87/IgHr0O7LUJ20Gsaw== X-Received: by 2002:a05:600c:4fce:b0:439:a1ad:6851 with SMTP id 5b1f17b1804b1-43cdc7b6dccmr41459045e9.23.1741475401963; Sat, 08 Mar 2025 15:10:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8de4ffsm97892025e9.24.2025.03.08.15.10.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 07/21] hw/vfio: Compile display.c once Date: Sun, 9 Mar 2025 00:09:03 +0100 Message-ID: <20250308230917.18907-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 display.c doesn't rely on target specific definitions, move it to system_ss[] to build it once. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 5c9ec7e8971..a8939c83865 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -5,7 +5,6 @@ vfio_ss.add(files( )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( - 'display.c', 'pci-quirks.c', 'pci.c', )) @@ -28,3 +27,6 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( 'iommufd.c', )) +system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( + 'display.c', +)) From patchwork Sat Mar 8 23:09:04 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: 14007976 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8231B17C77 for ; Sat, 8 Mar 2025 23:10:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475413; cv=none; b=bt8VTsyLYz34peE3uyoCRaz6iBi66dGhUSfRPk2DsldVrOnjwSd/uHbnga+y1J/cKQZOq6XZyx2d4xsFZz+ysgMfUIzx2mYAxWi0Ce0A11ll8cPOeTO8tQ5xVCGn2527HyJ01h/yQotGG7uUxsuyQID8juRxx9PtvzvxaNvammU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475413; c=relaxed/simple; bh=nxEtO0Km1yvcxVktFwoYFYWQbtl8UBAwyhOz2wf19rU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=geXDn5SjVyQxAprZRTBa+I6Y3Ceo5DS4gTlQC5ddXqaMfAt0LYC0mdnlHOqnNd5bz8GR3z9EaB5JmU9qPt7F+hduBipmy8GrS6NyHFSy+FB+pJ1b7imRezX/J5yhwE6yJSghjviPfS0bJDSdasfYTOqMTX5GO1N2X0zCQ/B2ESM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Epf58pQc; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Epf58pQc" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43bd03ed604so26020515e9.2 for ; Sat, 08 Mar 2025 15:10:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475409; x=1742080209; darn=vger.kernel.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=lfxwOIZGSthGrPYmV9+XOb1nB6O0gzLqIcndrzluicE=; b=Epf58pQc4/NM4mZEAsQRTo8sc9ZwmzsW4zBRKv+aytBreRBTCdAigA1a9834leRr61 3Dpy/1Hj0cq9kgMHPLp1bm8rrkstUjRCBJcjbverwDUFGgbQKZ5ZxUZF53P6hyFlO8M1 DBNvZ/HgJ+BpCQxybtcepE3eJ5NxqCx6YdkvJc5yKudwYMIF8pbBeV5AyddFhzrVab5s Lei9z5FQYBXNbUNOOpeNlJHA2mNyX62Dg34LdhD64M+XSKfZULofhjUbhPPSaOIHOSRT lDuvoh87wcF2wYGpQtqDwvSQ4lUKA6hWZ9YtOrrH5VOYx21T2FYGZgWv/ztDf0Sxg1Jd uwTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475409; x=1742080209; 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=lfxwOIZGSthGrPYmV9+XOb1nB6O0gzLqIcndrzluicE=; b=a5Lb2iGqWMGq4tuBs8gf44DqX7ah1to11bbgkI1/nk69dA79158aqExDAX0o3Nc5p5 ozy28x2PKZ161+DQU0QApKTJ3378tkNQBblQggaLjglvcc6MEehHYguNrjZ1H02V3gOP 94BiZ7fkAIdmM9nuIATpOfvQ4Js5pn49JKDAW49eV/rzXe9oYbTIISkYL4YY1lgbOvMJ I9Ek4UG6nqeVj9OchRfmaslsYM9KDOgUtAO9qF5B/HLHRpRaMP7PRbYqtGwP6fJH+OMu RG7CFzbv7GqrNAEEagMGyFT4Gzcsl3mFGGD5B7HT4CXdujrTRID6RrbAxs91PWM5P8o/ ybRQ== X-Forwarded-Encrypted: i=1; AJvYcCVLoOIcZ1S8wNLwV27Ujm3GtCX6EIGn3Wmwzj5KPeuDUglhdD89g3a0G0EEFVDymbO89A0=@vger.kernel.org X-Gm-Message-State: AOJu0YznStW3f6u3yMfCmNoELa0gMOshzbtGhCeXf9OsOz+EquzFf+aU bJL0IY/T2+MUF0pCwMo4IXNxRh7nKSE+lyrV/YDc9TS613AYlp1UBGWeA8dmvUU= X-Gm-Gg: ASbGnctvHoj/i+BFD/9aSjdHToyAIZVhBBFmxk2BKKulJmJ5QCqa3hHeAmLjoc7M5f2 zOWdkd3QLMkd7FVHr0gXjbXDe5MIIA8Kr2KQvGttHMfGygKcssCN+xUVI9w5JOResuOIKDYo3gR KCnC1FKZGLwcjBcT8jLyczRRlTjtpLW9mVURcryPkZHqOy08rso79mXDVhSxeXRQRtmGkpE8oLc L9iFmXdrAFL3SV52Nd86S0UGpFlNNoa5LI+6y1mHAep3ct3Nxm6PoKoDpUQiAx6O9ZqFN96WVXT FT4kU0ry80ho8o66D5fNAMjgb7Jqjux+AGa3xskvXhmREzjUMLV9gZdYlKLktcsuEuDKwaXJ8Ov 4KaG/JF5/9Zd7d0MtHUM= X-Google-Smtp-Source: AGHT+IEqYFt3ONWw2rS9Wwh6tBBRqOLce/1aiPLRA7IaFr0DAlK7OI2TQrPavd/72gpTyJnokKbccA== X-Received: by 2002:a05:6000:1a8f:b0:390:f552:d295 with SMTP id ffacd0b85a97d-39132dd8711mr5569888f8f.53.1741475408786; Sat, 08 Mar 2025 15:10:08 -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-3912c0e3250sm10154532f8f.61.2025.03.08.15.10.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 08/21] system/kvm: Expose kvm_irqchip_[add,remove]_change_notifier() Date: Sun, 9 Mar 2025 00:09:04 +0100 Message-ID: <20250308230917.18907-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently kvm_irqchip_add_irqfd_notifier() and kvm_irqchip_remove_irqfd_notifier() are only declared on target specific code. There is not particular reason to, as their prototypes don't use anything target related. Move their declaration with common prototypes, otherwise the next commit would trigger: hw/vfio/pci.c: In function ‘vfio_realize’: hw/vfio/pci.c:3178:9: error: implicit declaration of function ‘kvm_irqchip_add_change_notifier’ 3178 | kvm_irqchip_add_change_notifier(&vdev->irqchip_change_notifier); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | kvm_irqchip_add_irqfd_notifier hw/vfio/pci.c:3236:9: error: implicit declaration of function ‘kvm_irqchip_remove_change_notifier’ 3236 | kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | kvm_irqchip_remove_irqfd_notifier Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- include/system/kvm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..75673fb794e 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -412,10 +412,6 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin); -void kvm_irqchip_add_change_notifier(Notifier *n); -void kvm_irqchip_remove_change_notifier(Notifier *n); -void kvm_irqchip_change_notify(void); - struct kvm_guest_debug; struct kvm_debug_exit_arch; @@ -517,6 +513,10 @@ void kvm_irqchip_release_virq(KVMState *s, int virq); void kvm_add_routing_entry(KVMState *s, struct kvm_irq_routing_entry *entry); +void kvm_irqchip_add_change_notifier(Notifier *n); +void kvm_irqchip_remove_change_notifier(Notifier *n); +void kvm_irqchip_change_notify(void); + int kvm_irqchip_add_irqfd_notifier_gsi(KVMState *s, EventNotifier *n, EventNotifier *rn, int virq); int kvm_irqchip_remove_irqfd_notifier_gsi(KVMState *s, EventNotifier *n, From patchwork Sat Mar 8 23:09:05 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: 14007977 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B702C1B425C for ; Sat, 8 Mar 2025 23:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475418; cv=none; b=YI9NcQtRTNn2Dl/023Q9/TOf/agEZ5UYED+xrr6kaVd4/L1pse3iug7SY/Ru2plbUJLPQmrzUwLgzGVJYdFCeLJ7X4oYZUBWONcFAMt/mguo8p3sWP58O/h67XN7uEMY4wyFm18c7IBYzmpgMbi0L8DDZShLHYLkoDj9XJsoDN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475418; c=relaxed/simple; bh=fufiwJtrmYk9kZrf6Nj6EkRNSLGh1JbTuh9JKdzh+0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HB4g+10OAH7SsTm6xV7HJ/W4cjPz/7InsKSgv5+GXVRInX3EZ/+Pm2n+cdiuoKw+dh5HgA8YQCOjybzLkmOCWqwKSijKKVGvw4KwcQ1r3c66KAXQcXi9PqYKdZXXPPaFkIp768ZMpyikcywfBa5JMtk/XJHWETCjn7SxipWMDK8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=mifcYFkb; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mifcYFkb" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43bd03ed604so26020785e9.2 for ; Sat, 08 Mar 2025 15:10:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475414; x=1742080214; darn=vger.kernel.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=UEvdVMyvXjdezRQS+46yXb37w36/326vMxQlDhu7A50=; b=mifcYFkb2grITwgII/fzuA7CSXjQD14LJX1bwc2hgTLSJAzmiIcOuZlPlkB60mdJH/ ljnWs1x+BnhNX2S4ZPBM23JswFMolWaVv8KG9wbEj+V8kqlaGCfvqZSBEkRgssKblrjt RQ9JGeGlfOhMJy68aOuO/Xu2jM6mZmktH3tAVyqlY83xQk2OinCgLRTX7FBUO/eHn5RJ 7YSTSA1zHLV15GscJHFWxKD2hPxor0g9E1f/zyr3eVOMeNVMsEm/aZk4g7sW3lfRyxDY liB6xOmDs0tWe4QMM4xzEYtgXuE3m2uuLf2++qtuImRK+Z7EqL/PtZnJBG3MDZyWm93f 1a5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475414; x=1742080214; 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=UEvdVMyvXjdezRQS+46yXb37w36/326vMxQlDhu7A50=; b=YtebOn17gA2I+euSGpftCyJ64dxgmAHc7Y8H8/9292a0swphWU9rtFMxeUPFpH2L6g k4eQWHkAFpe+siJrrgW/NDC/v9FkJLRP2wrvwFy/STscnWY5ovlMD3TWjaEWyDV6Pbg2 IP7ioFE1BVVpKbOSVIue3qpMempJ7IUNCnfE3unt79yaE1tcqrar2D6gjDVEfjBO0KAm GDQ1IsCvBNpNAeC2d0q0Xc0F3HyMV7CkeLk+9LMlfANhfUbswQJoB/I6Xl/l2YmCMOAX dWv7Cr5Cr1TOx8+AGkYOl8NGIA2Gj5wllxEX9oHsl//X9b6fZ2D+w8E8d0xQdtNaXJqD cGTw== X-Forwarded-Encrypted: i=1; AJvYcCXMmtFUOgDPgcyXBmV23pFw6xhQH0iW6RQOC3teGlod8kjKEErt5OfKWtyuEKGf3pa1dRE=@vger.kernel.org X-Gm-Message-State: AOJu0YzNtqk1BcmhtlES9D/OZlnFvTjHf5RgZV2HfyC5ZYxMBMYtCvFj 5nOvOMYL5Co6WjqpOhQe0tWlCKdO6dfYYpxuR0jioOZuV9r+iCZHZKy6A/DwDPI= X-Gm-Gg: ASbGncsQu1TZTucUNcz/SLLCJJTKqumbo5vJpLIU3R7tk85iyta59HMQuxe5PTJ+7oO ZW1dcZSrEOCD2HjgU20nT/oVsSk97+x7UzjwQwVhB5Lim1s1orIUqkH4u85bMbOd0twTyDZZroG B/R22z1+N/pojbZx+uqZakNOtN/LQUp3hrrKq8GjVPVJFMjFJM8Ac8m+aHgHtHoyglwaarAv3wT jD+9ye4HlMq6vSYOpdMwBsrgcVRFW/taZKhO8vbaQxRynosghh+ZVp7928tuPRr3BV8IQjC46C0 vMEzWK35uvHX2B2VwwOXpohIF9M2/la94zmPt0OG0BsTn6Hbi/3WPZS32SjRjibHDVppterF34r 6ZMHTq6ZpgCFZuCbXTPc= X-Google-Smtp-Source: AGHT+IHU+xQMgt3dsdiNnJgEOhNSs6YqxwcUDocahOsxR/CmDr32kZwcNq5kvICgYKsd1qnYF/NWOQ== X-Received: by 2002:a05:600c:35d1:b0:439:967b:46fc with SMTP id 5b1f17b1804b1-43c601d9167mr53509045e9.8.1741475414122; Sat, 08 Mar 2025 15:10:14 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ceef2fb8dsm14915575e9.18.2025.03.08.15.10.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 09/21] hw/vfio/pci: Convert CONFIG_KVM check to runtime one Date: Sun, 9 Mar 2025 00:09:05 +0100 Message-ID: <20250308230917.18907-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use the runtime kvm_enabled() helper to check whether KVM is available or not. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/pci.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index fdbc15885d4..9872884ff8a 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -118,8 +118,13 @@ static void vfio_intx_eoi(VFIODevice *vbasedev) static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) { -#ifdef CONFIG_KVM - int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); + int irq_fd; + + if (!kvm_enabled()) { + return true; + } + + irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED || @@ -171,16 +176,13 @@ fail_irqfd: fail: qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev); vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); + return false; -#else - return true; -#endif } static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) { -#ifdef CONFIG_KVM - if (!vdev->intx.kvm_accel) { + if (!kvm_enabled() || !vdev->intx.kvm_accel) { return; } @@ -211,7 +213,6 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); trace_vfio_intx_disable_kvm(vdev->vbasedev.name); -#endif } static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) @@ -278,7 +279,6 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */ pci_config_set_interrupt_pin(vdev->pdev.config, pin); -#ifdef CONFIG_KVM /* * Only conditional to avoid generating error messages on platforms * where we won't actually use the result anyway. @@ -287,7 +287,6 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev, vdev->intx.pin); } -#endif ret = event_notifier_init(&vdev->intx.interrupt, 0); if (ret) { From patchwork Sat Mar 8 23:09:06 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: 14007978 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF1AE1B425C for ; Sat, 8 Mar 2025 23:10:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475423; cv=none; b=J4DdXvveuXEdE6tF6LOtWecmdE9R7B8wbMDrFsVb7PyeouzDRXpTrBK71h1tyZ5cH//QY0S8cg6NJlZp7dVWpDSMz74ZqEqH8nEv6pnAr5W/enrUwb2/z87ilPciz39u4moaQhAE6gYX70wn7zMtL8F65nFFyY1lI6D6HyjskwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475423; c=relaxed/simple; bh=pSU027guXWV44OJWUo+ZHPch6oXSIyJRktU1hf+rwPE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XsGGy9Ze4odfPJ6/6s9fXXTETYI0Qkmp3ITUIOJ0DET+4RXB5NAL/SGSyRdmv4a4iRubA6bgNtMYiKjHJ0gvVPn4C1ebVcUOtEsnqAvhkgKwcITRsJsq0XV+PITlKHiUeDMd7KAccplQvSjIVyfbX3qoaZ2XewXYKf7AEJ+Kqgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JKO2YAF4; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JKO2YAF4" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3912c09bea5so2328142f8f.1 for ; Sat, 08 Mar 2025 15:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475420; x=1742080220; darn=vger.kernel.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=GJXNBj0mVkk7ow8GecZF5txwITRLIlUvrzgwdEPrsZI=; b=JKO2YAF4toC2CcOACIFBcsDrU+VQJQ72JaFYRujjY77OXv1yKg3MiEVGAnwpdbTrqN qyq9RT3qi49+27epD2bqSwEMfYygDB3aIFLXHhvlFOiQw3KICoLB6HOe8dVkRRMdCU2f FtDXMAdFahJutAQeciFZWAFQdKuVbhwX7DbWr/Urm2OwsJa83Wu2J3GXo5O486zDX7hN Jl6ieakQOFmHz6ekoKbybhJzOhICY3LI7PiCBB71Ed44GVYpZjzlnnfn6dDOAUZiClq0 w7eyOMgNpLaGjTah8sRrd6ulmi6MZjeD87Ukx3PVZw/TQI2hzVKWNJEf7tmcNQGc4car lXrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475420; x=1742080220; 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=GJXNBj0mVkk7ow8GecZF5txwITRLIlUvrzgwdEPrsZI=; b=Du0oe4Xm8+2YHPcIAYiA2isHyHztS5QV33oGAbvSM7o/baGNY1ZeZ+cNo1mUMZb1uH eaWzLq5temgq31ZJH91G9gOFwkfOK6JufrnNUot6bvcK1mQmjEvdte3ZMnn1QZn5GAdH GHOHOaDxrT7zP4UnFLr7vGdxUSqpyHJ6qpMYqC/VR7HzaJBzK1pO2CZojDCATWAvFJB0 9SSLkYJVh6E41G/t1rb2UsEy2dFuhRUxc60H0wj7FcADmMZmWCoD3NeeaV7LQUZ00u64 PVk/mOA9fKvDXAwnj3x8kpN/ERTUEqkdZMJ6O7sujas0nIrM5ZSKHXIPIf9zi8Mnn24P sIqA== X-Forwarded-Encrypted: i=1; AJvYcCWggkx9XRUs+vLOjfaziTTLfg28RYCg7EeoPYSK5cCQVThX6PsAUGDrGnOleUf7oBsmKQg=@vger.kernel.org X-Gm-Message-State: AOJu0YxLnx2TMDEcFqP/ENWxIpfEu8pBdRPiQoIXXKqUF/QOvQ0UMYkI 4tjHgbcQeMhFZjF+0cFL0r7UWELM370cjmpGawkG2D/7i1yCw0ExPKnp9UFCuWA= X-Gm-Gg: ASbGncuoebW6elEJEZLqqtLlLosQB8HbcNreJTFvxdwDBa6udlmUYAMbCEFjf61xjSg SVgziMNlCGTjXmV5nsp1LKvNKq4HLnYgTP6KawbfifCTslwgDn85RfDfK2+nkBuqE9B8qTjPMVs 7NFqCP7gS0or6NSIkgg/FxzakgPU/Y3OkaAgr6qtI+rtZt7bDg6ZbrH8EaXQDu1o5rI6thY+4sV DgDo5vYiv0DcxIfXtjng8bMlyrF4k8T2R5R1FwjwncvFWBRi/A7AxUIaWXaDZgQIVXlMxnSuyPR Oqk3bUk0U7eYutZmoA/rH0BL6U0bueRkvxSPC/7xPhPNKr+M5F6Fwwh5szl6dSjapWoH0KYOfku Xz34+vhk/s2LDww5iPYuIXJnUVG2zaQ== X-Google-Smtp-Source: AGHT+IHQgGDKYnpS8cvxChOVuSZsAjnTKah2viEVS9oNKXufBZ9Ckl/6tU+y5xvoKE6/Q1ES0ORdxg== X-Received: by 2002:a05:6000:1545:b0:391:2ba9:4c51 with SMTP id ffacd0b85a97d-39132d98bb8mr5365371f8f.44.1741475420168; Sat, 08 Mar 2025 15:10:20 -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-3912c0e4065sm10260184f8f.62.2025.03.08.15.10.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 10/21] qom: Introduce type_is_registered() Date: Sun, 9 Mar 2025 00:09:06 +0100 Message-ID: <20250308230917.18907-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In order to be able to check whether a QOM type has been registered, introduce the type_is_registered() helper. Signed-off-by: Philippe Mathieu-Daudé --- include/qom/object.h | 8 ++++++++ qom/object.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index 9192265db76..5b5333017e0 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -898,6 +898,14 @@ Type type_register_static(const TypeInfo *info); */ void type_register_static_array(const TypeInfo *infos, int nr_infos); +/** + * type_is_registered: + * @typename: The @typename to check. + * + * Returns: %true if @typename has been registered, %false otherwise. + */ +bool type_is_registered(const char *typename); + /** * DEFINE_TYPES: * @type_array: The array containing #TypeInfo structures to register diff --git a/qom/object.c b/qom/object.c index 01618d06bd8..be442980049 100644 --- a/qom/object.c +++ b/qom/object.c @@ -100,6 +100,11 @@ static TypeImpl *type_table_lookup(const char *name) return g_hash_table_lookup(type_table_get(), name); } +bool type_is_registered(const char *typename) +{ + return !!type_table_lookup(typename); +} + static TypeImpl *type_new(const TypeInfo *info) { TypeImpl *ti = g_malloc0(sizeof(*ti)); From patchwork Sat Mar 8 23:09:07 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: 14007979 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B6BE1B425C for ; Sat, 8 Mar 2025 23:10:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475428; cv=none; b=nh0pt6qpZ7bCSPg0fAabk1Oww4lIge+2etXCrswj1hotkDOQyV0s0VwadYdKjSoZciczrSMpP+pcxkrAh2U0be00dLs0pYwsu25twjIaftAhOIKdYHUExDS9F7NJZlfBB9dInIdYyyWiZwB68nK3Ce+62DMWGIqF8/Y18vTpxSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475428; c=relaxed/simple; bh=elWpsIOnV0p3LFy4LnL/vFxjO0MGaJh5o5Tte1c4oC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VGu75z8lXAp1+gh3/YB361kMINuIrJViOuTCSghMiykasVNMgeD+NU7XeYTTqRIAKo3imjt2Rv1ys2a9dl35Gw7dwnzZu/YMMjCwFqYR4weJ5xmiYgfpH+73L4sZ3zhvRAtaXIzs77Yfd+4liI7wQLNBRTJ8gG7ARkiVA1ou4ys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=l4WB1w6R; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="l4WB1w6R" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43bcc04d4fcso17916375e9.2 for ; Sat, 08 Mar 2025 15:10:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475425; x=1742080225; darn=vger.kernel.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=OAApOfCWWikXdcBm+45ltUmeOBmLQGFruMZPHaiGOZ8=; b=l4WB1w6RxIj1XfV8FitOLA8BtSlVL3OR4eW43OBstDDECzWe2v7fmrNghHANYpB4l/ Nj+kZltdalxMwhKu8yk2tN8xy67Iv0Z+ABO3CZffJ2xjZkSVdll0nYllmYd1ts6bVTu7 gdV9pZBXVh51kvDVMkzAcUrZ+Q2d2+huDC3tbIw1Bv9ldF+BMeydFFCDLzWYvxu/Z1iH 4aDIv90zAXeqAqMF1X6ChgRikKZi+xIsSbKmSjlraPDl0MyzYRjhj/dq5teDe5uLhOl9 BGf9yx4tfPsXkKMw+0FuiFsM1TRJ6hqtKbF0it7T4IFmc3ttgk44QgblqViCiADlq0D6 s4MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475425; x=1742080225; 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=OAApOfCWWikXdcBm+45ltUmeOBmLQGFruMZPHaiGOZ8=; b=mI1ONnVxU19OLbgPxB2S7Uxwv8JM0YLepG3731LVinVfVdr6xWpEB8GHgHngzspLvI aGWJze0qrSWd+6BHp6r0xaZJuSpqEZnL/WhS/zsVOxpfmtHKR5z5E3HePc637rK89Uat YZDu1EmdW9OXw0aBmJQuOBTSjDVZeTdyBdzXL7jmgsAwrFU+6q6o5ohfRj2raaCTz4Cp aV8wznq8rpdbfVTsn4I5bgUxSihIRnvFLJmUYT0MqnCRVovEWyppYPi8FIENhZlqa5tZ l1GM8/4fHU6HO/AnNJfx1fZwCFIdZGgV3gztv9PsGZ2qGTBqDkreoKRqo2BGz4CZVRfj Mkyw== X-Forwarded-Encrypted: i=1; AJvYcCX6nmDNmsg3BDeD09eQavqTLCjvbl1R15mXdf5pG9OL2DjtT0u66ijwDKdCAeq49kp1OOA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2SEzop4WJwkYs5Eno/732ht6qQSDAn87tceEShZOp4R5TXSlU aCvmJo586mY/j+GzfpDhmU3C8OMECGaOwtQvm4c7J2YCEjGjvbQ7AnNzhl6PJp0= X-Gm-Gg: ASbGncuk6qvWKpyF/CoknIiRpLpfOOPXFK4MhuOLlHNAGQpy/90OxjUTW+LKPwmZqNS 0fLpiSsEX7lYzZphyY+uWBmGE10MQhYwc7J8mZPHlmaggUzk6ab05YQhA49fSRVNKKeExJxCwUg plACNLqTAl5aCW1sx6+KrIzQHhxPSakiz6XQ3JNGdIL35uNFiUzhqdMkeDc9QrGoi77lU5jFwth wlNZKkPTfCBKaXIgYtwmYkn+FfpTjkQ2PQD1ZXbm3HKWwhtQFZseCfKOMeThpuwGa98czGoHT4q q9SYWJx4ZMp4gBOY3LEMsxZttGD4LRHsG1VdyAZPnd8xf7CWSDgUkjayLvXfY4c3nNz3EaOYVbF DUhVY46jxlDYk+SZ76zc= X-Google-Smtp-Source: AGHT+IEsdUpzC3vvzIbC6qsVM93qE5A0/3sv2x9KGYFFRAItc0/EzKZy6rlmtqCICch1ekTW0tHDTg== X-Received: by 2002:a05:600c:3b1a:b0:43b:c541:51d3 with SMTP id 5b1f17b1804b1-43c601cfe2cmr50795605e9.6.1741475425507; Sat, 08 Mar 2025 15:10:25 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ceaac390bsm30320235e9.35.2025.03.08.15.10.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 11/21] hw/vfio/igd: Define TYPE_VFIO_PCI_IGD_LPC_BRIDGE Date: Sun, 9 Mar 2025 00:09:07 +0100 Message-ID: <20250308230917.18907-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Define TYPE_VFIO_PCI_IGD_LPC_BRIDGE once to help following where the QOM type is used in the code. We'll use it once more in the next commit. Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/pci-quirks.h | 2 ++ hw/vfio/igd.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/vfio/pci-quirks.h b/hw/vfio/pci-quirks.h index d1532e379b1..fdaa81f00aa 100644 --- a/hw/vfio/pci-quirks.h +++ b/hw/vfio/pci-quirks.h @@ -69,4 +69,6 @@ typedef struct VFIOConfigMirrorQuirk { extern const MemoryRegionOps vfio_generic_mirror_quirk; +#define TYPE_VFIO_PCI_IGD_LPC_BRIDGE "vfio-pci-igd-lpc-bridge" + #endif /* HW_VFIO_VFIO_PCI_QUIRKS_H */ diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index b1a237edd66..1fd3c4ef1d0 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -262,7 +262,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) } static const TypeInfo vfio_pci_igd_lpc_bridge_info = { - .name = "vfio-pci-igd-lpc-bridge", + .name = TYPE_VFIO_PCI_IGD_LPC_BRIDGE, .parent = TYPE_PCI_DEVICE, .class_init = vfio_pci_igd_lpc_bridge_class_init, .interfaces = (InterfaceInfo[]) { @@ -524,7 +524,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) lpc_bridge = pci_find_device(pci_device_root_bus(&vdev->pdev), 0, PCI_DEVFN(0x1f, 0)); if (lpc_bridge && !object_dynamic_cast(OBJECT(lpc_bridge), - "vfio-pci-igd-lpc-bridge")) { + TYPE_VFIO_PCI_IGD_LPC_BRIDGE)) { error_report("IGD device %s cannot support legacy mode due to existing " "devices at address 1f.0", vdev->vbasedev.name); return; From patchwork Sat Mar 8 23:09:08 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: 14007980 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87F3E204C0E for ; Sat, 8 Mar 2025 23:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475434; cv=none; b=KXIAHLe3Spd632BGuGCBqgyA70q2/zyJKnuowF6kyVPHf/wKXjenBwQ4s7x3UN3vOQC9mffnjfK5Npai5mLu+Ue+5pJhKpXWENoyumo6DpjgdnmX6jZFEkytxcLr5tampExbQQrElzqUv5U35NY3uj4LpLGhPMMk8Fs00ryPvrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475434; c=relaxed/simple; bh=ZNMxDQGH/sVZUrTxysAVgzIDNumCJrah7sTuY1lpDAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NFYrwQzxgnYUoQjPS18BNsz6Yc25iV9MGXtX3xEivg0CVpjVJDw9CyyOAMe4cCbLa7qWcNTUA8bR0Y54Vj6CdKpxgbl4kWV71on6z4FKM+CGuje73yw8Q+7wvXzZf8GMyNocrs+PimF3kZnu936ShGVhqu6zOCEOr6jk+X6Jh2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ndGrVitr; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ndGrVitr" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so4078315e9.1 for ; Sat, 08 Mar 2025 15:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475431; x=1742080231; darn=vger.kernel.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=kqJ8O34qNgm7bETvjKnBNqBiS0iJjz9k+q/OCgWJZ8A=; b=ndGrVitr4n2KZoqFYCOgZJNDoTNHUqQPQDZ0FQcSweb6Y8rYPSnAJMqE5H3869oJ6t 4Qn981c6gMYHktNb7Ur6cLKnyQyskBvkHOYvq/7AxL0ZCVKQrCs2p48cSkrWA22qQcfQ 95OpSOIFFKe/b6bj1ZDTXprbN4IeMEY6XcAp9WnRlrGqdsZbnqvCTJQw2PLJb8WoFevv 7l9z6R48rEeJzBYeRmJgdpPegy8Avyj3vxQXi0uTxIUzSeXFkw3dXP1yFfWT5xnE1Qo4 7qMDgGLx2nfQG/mqcDVsiC2qVw4HdbXSm0oiSahHypMvoJHLlETZusF9yOh+6PkpgkO7 azbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475431; x=1742080231; 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=kqJ8O34qNgm7bETvjKnBNqBiS0iJjz9k+q/OCgWJZ8A=; b=uaG5BWaDvzzLb33+NewEv+uo/mbiRdfkjpgjKggpGA1x30xcv4uKkfQmK27erB3cbp lU9gEDtBVAJHNX4uT3kv1JzXbBVTCVOsG9SIK0u7TiiuXcdIFDXc9QqcdXl+UaU6AZRR xLczappMyRR4pY2futZLNLDRXIPtPCPxuEruhLDeoMEcwkF0Dvgh+Gzv6VnbUUaOT8af I4tLEiyqQwa6v66j50cZIgD46QePbsttOUMXXVAumrhy0F5b4vbpSmZpjNFqEJvRNSA1 1cu/siwy2mj6UZAFU8mWuyJdSWVwDBtj8Y/yomZIQTTMcMZ+Zkgg6tKaIqG3feVlxNzs PFTw== X-Forwarded-Encrypted: i=1; AJvYcCWJfFFMvD4mizRfQC8hMb7XCFqTIVwwNBhNqJ+CiqWlOk4pj8wQDhAMWPU0Sj7wiHZM6jM=@vger.kernel.org X-Gm-Message-State: AOJu0YyIs36q2wyo/UHWhq13DcfPY07eTWqDtrJ2cA1YD9X8yM5Swblt YRu1VcUfMkUk0gh6snW6Kv6PWmPi+NpNR9iJ6MzFLUNIak9CYlhYiuIS4jyORDY= X-Gm-Gg: ASbGncuZC/PF6MeR6ao6fm7QeP2TrUr/zYqRbCbE2yk324eNK616774i8qzPX4GtEwa dmuH5xHj2OCw2yOMaaPp3vEEfFaxMJUu7m3XC0eW9i7wu3b/DE+8PDxhD0I/BltoS90dGT4ohf5 lNc3znXe+MiwMGdxgkk+U06zOxM2yMfdJ8iASZMQsEqlKcquPSp1pM+ZeIw9llI1ewJOLtI8tjA vfnELQ7SxAVgGTDUT3Vx0nRql6tvYI5X7U9Bchlv4NTYmmBIHlyCRciFEsxublDh/I4pnXmSSt1 gMu+onw6HjfOP/8AXL+FXBf/biWFcA8eJnlMpdTGiaXOQYHCXXVzQf1fQ+J3WJvBCS28Iuo0+Bb i8bxCTDwG6KcwTAmdcSc= X-Google-Smtp-Source: AGHT+IFLHFN9rxCqoijA4uedrenofflj7luyFp9CUDQXWNq5DjV8ZWge9xhKDm/5wVHFLL1LrIgcAA== X-Received: by 2002:a05:600c:35ca:b0:43b:ca8c:fca1 with SMTP id 5b1f17b1804b1-43c5a610dc3mr61655845e9.16.1741475430716; Sat, 08 Mar 2025 15:10:30 -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-3912c0e2f10sm10124731f8f.65.2025.03.08.15.10.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 12/21] hw/vfio/igd: Check CONFIG_VFIO_IGD at runtime using vfio_igd_builtin() Date: Sun, 9 Mar 2025 00:09:08 +0100 Message-ID: <20250308230917.18907-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the compile time check on the CONFIG_VFIO_IGD definition by a runtime one by calling vfio_igd_builtin(), which check whether VFIO_IGD is built in a qemu-system binary. Add stubs to avoid when VFIO_IGD is not built in: /usr/bin/ld: libqemu-x86_64-softmmu.a.p/hw_vfio_pci-quirks.c.o: in function `vfio_bar_quirk_setup': /usr/bin/ld: ../hw/vfio/pci-quirks.c:1216: undefined reference to `vfio_probe_igd_bar0_quirk' /usr/bin/ld: ../hw/vfio/pci-quirks.c:1217: undefined reference to `vfio_probe_igd_bar4_quirk' Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/pci-quirks.h | 6 ++++++ hw/vfio/igd-stubs.c | 20 ++++++++++++++++++++ hw/vfio/pci-quirks.c | 9 ++++----- hw/vfio/meson.build | 3 +++ 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 hw/vfio/igd-stubs.c diff --git a/hw/vfio/pci-quirks.h b/hw/vfio/pci-quirks.h index fdaa81f00aa..dcdb1962600 100644 --- a/hw/vfio/pci-quirks.h +++ b/hw/vfio/pci-quirks.h @@ -13,6 +13,7 @@ #define HW_VFIO_VFIO_PCI_QUIRKS_H #include "qemu/osdep.h" +#include "qom/object.h" #include "exec/memop.h" /* @@ -71,4 +72,9 @@ extern const MemoryRegionOps vfio_generic_mirror_quirk; #define TYPE_VFIO_PCI_IGD_LPC_BRIDGE "vfio-pci-igd-lpc-bridge" +static inline bool vfio_igd_builtin(void) +{ + return type_is_registered(TYPE_VFIO_PCI_IGD_LPC_BRIDGE); +} + #endif /* HW_VFIO_VFIO_PCI_QUIRKS_H */ diff --git a/hw/vfio/igd-stubs.c b/hw/vfio/igd-stubs.c new file mode 100644 index 00000000000..5d4e88aeb1b --- /dev/null +++ b/hw/vfio/igd-stubs.c @@ -0,0 +1,20 @@ +/* + * IGD device quirk stubs + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Copyright (C) Linaro, Ltd. + */ + +#include "qemu/osdep.h" +#include "pci.h" + +void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr) +{ + g_assert_not_reached(); +} + +void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) +{ + g_assert_not_reached(); +} diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index c53591fe2ba..22cb35af8cc 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include CONFIG_DEVICES #include "exec/memop.h" #include "qemu/units.h" #include "qemu/log.h" @@ -1213,10 +1212,10 @@ void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr) vfio_probe_nvidia_bar5_quirk(vdev, nr); vfio_probe_nvidia_bar0_quirk(vdev, nr); vfio_probe_rtl8168_bar2_quirk(vdev, nr); -#ifdef CONFIG_VFIO_IGD - vfio_probe_igd_bar0_quirk(vdev, nr); - vfio_probe_igd_bar4_quirk(vdev, nr); -#endif + if (vfio_igd_builtin()) { + vfio_probe_igd_bar0_quirk(vdev, nr); + vfio_probe_igd_bar4_quirk(vdev, nr); + } } void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index a8939c83865..6ab711d0539 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -17,6 +17,9 @@ specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) +system_ss.add(when: 'CONFIG_VFIO_IGD', if_false: files( + 'igd-stubs.c', +)) system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'helpers.c', 'container-base.c', From patchwork Sat Mar 8 23:09:09 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: 14007981 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76B32C2FA for ; Sat, 8 Mar 2025 23:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475440; cv=none; b=dnb7rWwaA7LM7r2nHU437SmxBgWrqNREIKhW9ufPrq7aWJwRLYUZUmaL+nO41yWMeGbtHCpBBc379dZoDKrfcVsUn73TgBemM/ki3wyFcikTp00+S391V/5TTb77HFlpJ3XjLZBTdZ+TmF5SNxyZAXS7PE+Z9RfUdTUKZzHIg3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475440; c=relaxed/simple; bh=0503i25oiKvX7riJYo2CLDDJ3sqilJTvQAsPM3F1GZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uqdWnr33dqbhOz9NpmlZ0pH1eU3/P3E7CDuXn4l4Y8H5aEbJ53Fp5ltABOOxJrIDVo5nh+MF74hFdz3hnCG7DuNHCPA/Hw9mdmxlC3jYoFAARdnPXkN1H+RxJ49nSh5NI1fmTxXj2gARsKZbYWUSsGuNQJWaG7lIV8eB9gpmIAQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=BOUPgcAw; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BOUPgcAw" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so4078485e9.1 for ; Sat, 08 Mar 2025 15:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475437; x=1742080237; darn=vger.kernel.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=PCiNgLEiS6OiisxvVuwTtdLprKkJGMzsN7gdfZerLX8=; b=BOUPgcAwWH9ixnYebsoWq0m1fP9E6EHc5CWyO5qrc6GY5yoi5kABp5wJMwokEX504U ptP6eV/wvq1nqut/yGAILBjU8Mm63StbzQACWzW8wXWZd63SK7jUhv164bR0cOKZA1b3 kM86F/n1Z5iAI+wk7+uVPRu9jhWcsUncArH0zjcN21HVB1XyFB4VsRze+uto+PJb9D+j XPrDyGaBfuCLs1GJ51HOGbXaQirRgy2ZE8yqtiMRP0Vo/TgXpdPufEjQafiWhu3fQ13+ 9N5Mn85AumH4gNKYKkeKVTckce65NL5IqqFklhSsnwbMBpCmz0tydKE24CMDbhx7e3dz 3J0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475437; x=1742080237; 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=PCiNgLEiS6OiisxvVuwTtdLprKkJGMzsN7gdfZerLX8=; b=cF4jU+6F4FUzI0yNjl/NRBjLQLh0faw6A4n7QAcfoVrhIg5hfnnnMN6MmESepjXTxC tuJ8yOgm3AWg3n5ByILNvuPpPCykmgNCWNq0ipfNzrbZHxbVtcG8aoGVK+T0rx5ZojSn H1/F2LyKskg4WQ6uMoOrS8zeQVJfFnM8hd92Duob8LpDcYCtgdFNf/kz1fPQ9+wSXdc2 T3wK1pHjRxNoM6wr2vMJpd27wmVjImMrGdBzcKbLHKLBLyyDZOwZeUXxyADKpgqC5UIZ /uUly1uw8kYvmoNY1g6Fo9w8teO26e1BIAsFGWLVXNILhWC+tjE2L73ILPlR70othrvJ ZcMg== X-Forwarded-Encrypted: i=1; AJvYcCW76mRJ8ld1FpeG3kKM15jHWn7CvvsZsDf0GxfSpS4pX2O5BxmeO+zCcAzMjfcGy9q3Pic=@vger.kernel.org X-Gm-Message-State: AOJu0YxY0zWoLf2X2YbtATISliXjYXJXhm4e3pAoJ48fcawoKh4wammq 2qy2BYpzxdSOcX67r3+EV6zFUV2gVCQksknBhaKqXfwZQVnxTcQXTaYVCOEdDAo= X-Gm-Gg: ASbGncuKTKarbkQWTcq1kz/mp3DaewfsLusDlMwJOYOjQGPsMlxxhSsiQ1phtRkHaFD jrDjcENzs6GAg6pqJbB/m/GA61/GDZaZ4gXRPDCIkztfI+h3lx1HwQ8rysp9hdtG1GniJEoyva8 KYREcgMe5aGBMVLjJojMzrSuXDGboDZrj98aGzRJeJAKCtwhNqxP7StLZh44qPgWRTvni1LisTU 0I3U0okmLxqLl1WGfvZ7KZRJvcKgmoCNYT/hnrWWPCMAOlLw/dRpB80DbUL7zZyjcLJTAobM0MA CvrUGawb+H2WUoKElcNIwZTo42Tv9Kyl08q1kGMxO6XTlDpbEPyCPyicayDO0e1EzWuMgqLpnEw sU7g0xm1qpGUmhkbXfd0= X-Google-Smtp-Source: AGHT+IENrA47OVsXzaZX4a1bGAgrCx0XL0i2aOlzI6Mq7cL2vI+8HE9sGHrEgItEH0nHk0n3/e8OGA== X-Received: by 2002:a05:600c:470c:b0:43c:f050:fed3 with SMTP id 5b1f17b1804b1-43cf051022dmr4854905e9.11.1741475436763; Sat, 08 Mar 2025 15:10:36 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42c6203sm126860865e9.24.2025.03.08.15.10.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 13/21] hw/vfio/igd: Compile once Date: Sun, 9 Mar 2025 00:09:09 +0100 Message-ID: <20250308230917.18907-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The file doesn't use any target-specific knowledge anymore, move it to system_ss[] to build it once. Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 6ab711d0539..21c9cd6d2eb 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -11,13 +11,14 @@ vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) -system_ss.add(when: 'CONFIG_VFIO_IGD', if_false: files( +system_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files( + 'igd.c', +), if_false: files( 'igd-stubs.c', )) system_ss.add(when: 'CONFIG_VFIO', if_true: files( From patchwork Sat Mar 8 23:09:10 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: 14007982 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B92E01F9F5C for ; Sat, 8 Mar 2025 23:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475446; cv=none; b=cOrEYkzOB60b4u58/u+65UvQIrqpxJu7DeDpBnw6gdeREMiu3uI6TK9M2fn+BWbrZJG5r4NpEQjydWrKscpDVLv2Bz6BKS8xs+7N0uV148FHkkhXlWku2e96w0ngUIa9FdON4vtgvbt8wM1sqwQzSeelpdqFxMMKuUqiN+qa4eo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475446; c=relaxed/simple; bh=aqPEb4yOPrVtNlr0AJyyI8wIcJ0q7eTX0wEHsEYITYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NGFYffr77f6sMg/8pV115JgDftAOSE/7K17x6tGm5f24T78C1m+vyvDMJJzQ5UDjJoQCFSdjblMQ0AGP4oiVnSXASbGK0zso6WzQL4UCmyBWS/634nrTbANCET6Hdc8cN6WlLzK37MnnFm88k7mZzJCiw9tEBim4rVsB6kqqc2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=fpxWITAR; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fpxWITAR" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso1297945e9.3 for ; Sat, 08 Mar 2025 15:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475442; x=1742080242; darn=vger.kernel.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=e994k6DJ1GVQfS1v420FHs4KoJEVg7ohUIOs13xGxIQ=; b=fpxWITARpU/PV1If7xs2Q3qT2woVj6gqDAdJYu6gqA68szLzbhGCEtBW4D7g0dRZMK Vyrl7W2pror3t7oGJMonmNWdepCxsG9QdDYgl9Aoz5W0m8Mk/kg1NyYinS7Z3wGlKXBr d3Se3C6HQp+PF9IWf6aZby06WbwDs13x1rznWluqhe2XLDysSU6NSRgIEXvxj/69sy6g ajjniNjt3tzZ2i9wKj2+l4bME6WX7UXhgst0JwqWyaaP1CTaRVjS+0gCK2p+VPjjfJUE QJr/edPbVvaeI/az5f7XJ7ORVPcZPLC2UTDXWF5G7sgTR/HMNjmbY5Zcj6KleiGIbbZp fKsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475442; x=1742080242; 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=e994k6DJ1GVQfS1v420FHs4KoJEVg7ohUIOs13xGxIQ=; b=wBAOIz70Ssmuo6GlKqzI2hvbRW8gWZNk4FL9VPR3Xa3QfHgWv6w9EZK6fSPuD93wRf Syo4rwIfoT9Jj0HTaz1NdQMWhthc1JlzmsDAjPOFF7yXafH5Bo6tbfuCVHdgpVbPreR4 mC+uoFrye/LizUOTgpKr0S+Hytmilq1TOMFfiW6oiv/uES2gTNijrw9ZYkeCTQUAAvZ8 RCrc/viRy/LHBKSy3Um+p/PzP9FO5ZXxbuCNHbiWZhwg+IJ6euBRaE3ccwkCi2VuW/FO 2R3NqtsxNibI5ezXxF0bfEPsJ1rBRL33JrGUbYjNTs8YBPh6La3vHgkv3Bh945iC0ccF XoJg== X-Forwarded-Encrypted: i=1; AJvYcCVqKOuKjFoqZDBnLMMke3ecuvjruZ0806jTmk9OPcI3cUJtd3j+oqECL8mExgqG/TlV7xo=@vger.kernel.org X-Gm-Message-State: AOJu0YzX4K/qQ/2giVKcLXtBtHHgD/7XfYpTVtz1sv2t33wRgiRIeSGm 52JVDnTa05rk89GkkrDWui2INY8rrYxfyiPDlqp50JXWiWk3C1KOTZ/UnTEeYps= X-Gm-Gg: ASbGnctzeeuFjc6Wm2zOBQycYpwuZdxIKiW9KKGd2+NL+bP9Aaw4utavVkFC4RgZbdJ X7xFM340XTi999Lz4pgOeQw7oSJwn96ST2jem7Hn7o+nOFGlRGvPlmk65j+mDEYngNnWbqQWqeX xXj87vaW+7fbqnuLnY5rjwg4v970OEwsOFAOFfcgCkeYICMGlGdHnFUKyXWAFMnxZvsW5HmfHU/ Vs1pzRsl7kRzw56AfbjLHgNKMHAePz5E05jDmLL3R6binCAxSc+ke91w4d1hDD8c5Ze2TBcS19W iyCH1leow4BY+moDo5pjc431CpMDEe9Db7TUG3vYbOlKpQuJPgtBRsAdd3VozIVvQxt8ZfL4NAn ON9tfcOXAfEegJXQf1bI= X-Google-Smtp-Source: AGHT+IGanFAG++lqDWp4faa7iGXFNwWsx6KoPF+8GUYwA8SvvtEs71rNKQ7140I7e3KcmDtaGGxtiw== X-Received: by 2002:a5d:64c3:0:b0:391:2932:e67b with SMTP id ffacd0b85a97d-39132dacfdbmr7249820f8f.35.1741475442093; Sat, 08 Mar 2025 15:10:42 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cec28e1c4sm12949955e9.1.2025.03.08.15.10.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 14/21] system/iommufd: Introduce iommufd_builtin() helper Date: Sun, 9 Mar 2025 00:09:10 +0100 Message-ID: <20250308230917.18907-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 iommufd_builtin() can be used to check at runtime whether the IOMMUFD feature is built in a qemu-system binary. Signed-off-by: Philippe Mathieu-Daudé --- docs/devel/vfio-iommufd.rst | 2 +- include/system/iommufd.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/devel/vfio-iommufd.rst b/docs/devel/vfio-iommufd.rst index 3d1c11f175e..08882094eee 100644 --- a/docs/devel/vfio-iommufd.rst +++ b/docs/devel/vfio-iommufd.rst @@ -88,7 +88,7 @@ Step 2: configure QEMU ---------------------- Interactions with the ``/dev/iommu`` are abstracted by a new iommufd -object (compiled in with the ``CONFIG_IOMMUFD`` option). +object (which availability can be checked at runtime using ``iommufd_builtin()``). Any QEMU device (e.g. VFIO device) wishing to use ``/dev/iommu`` must be linked with an iommufd object. It gets a new optional property diff --git a/include/system/iommufd.h b/include/system/iommufd.h index cbab75bfbf6..3fedf8cfb63 100644 --- a/include/system/iommufd.h +++ b/include/system/iommufd.h @@ -63,4 +63,10 @@ bool iommufd_backend_get_dirty_bitmap(IOMMUFDBackend *be, uint32_t hwpt_id, Error **errp); #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD TYPE_HOST_IOMMU_DEVICE "-iommufd" + +static inline bool iommufd_builtin(void) +{ + return type_is_registered(TYPE_IOMMUFD_BACKEND); +} + #endif From patchwork Sat Mar 8 23:09:11 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: 14007983 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE66520F083 for ; Sat, 8 Mar 2025 23:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475451; cv=none; b=gp/H5S76p2SvfP4U5ieOYmRYMYaslAo0v7VE5VOtB9ZV68G6qgohy/izak17NHhg+pyAZVOqngpNWcdxkt/bVoy1PnQ+SAQFFrDeAgs0L1xvZN6J68jEDeNtxbRJ/I9qDTrFXu4Osqa1wZkB8MKmGni/I09iMmdsPX8byOF3X8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475451; c=relaxed/simple; bh=Thj+uJzLgQ7BqnoA+PwoNvSZQYPTABL7cPmxH1Gg5NU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RiggTxq8m/eIttTWF0+2S0tLYZ9X4FVH42AZKQlU/aah4reOxGd2S2e4Nc4ddaaWbhVb7ketvR6FW9wyqOnIqxd7D0J87CHAelFgcfQ3zzBC9QiC1l+jw+Ev7zWYGhtPKdLABsrz1SzCktF6Psmwh7F66joZ7oGlJk0rmQTeHDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=pcWZxKfQ; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pcWZxKfQ" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3913fdd0120so217392f8f.0 for ; Sat, 08 Mar 2025 15:10:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475448; x=1742080248; darn=vger.kernel.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=rb5Gq5gjoqNir/3li58uEI51RqNLZd7aJ8wRwb3WrW0=; b=pcWZxKfQ1rYSFopE9uNUEEak91WmVdiXEogtOIhLLhacIjG4PCyM+DkYviGJtJ2eKY OVgERrPS+Dyp6n1bczJ88aACxsfufm4wbbasF+JehyiA5WPOHFWioyO03bfW/8YpcobT p3Pk/St12eSCJsOjJteTxq/HEPFUyDkR1kCfvy6Q11wQLQ/ZBjMiG4u9pmjuhIZNGDo5 k23mYyIYx00ncJxw7FB5W8dxZYu85ZSafzToTcME6yMhebdzxIWWvgqGYCZGJvq6FX0E tJzmABU4HTHK/dT2oN4Uzq4HLkcVDH5k7tHrrp4qxaZdxvre8sSDbZmrYghFko363v2O EHSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475448; x=1742080248; 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=rb5Gq5gjoqNir/3li58uEI51RqNLZd7aJ8wRwb3WrW0=; b=fbMVfjne6vxlknXRDWlfqycu9dq+R7U968r14TznHEPeN4D8JZKTUWTyObTAjIdu67 W+8XZXmicSbwr76DhWGVd0x+t4t3UHdXdhJsJsaw3to+RHKkimQHreI1xunrdgOYLrwW qiVkwkRldtHiGqXA7GjJGDiOKTos1hEYxSIjnVfcrrK+KENhl61YMNUPGs5h+hPI8/o/ OQoKkbiueCgOtU3cO6nFTfO1NFQoyEQUJ/cg5wsRPa7rW3DhXLLFzDpPZfzaQSHnpLo6 GEfz9aqnlxg0xpxHgyVv1hANUUpewt6913AHH/z2ti3dhXBXGIl809AUZn3KsKvfSmlM cGVA== X-Forwarded-Encrypted: i=1; AJvYcCVTsIxzEixNyqIv0oxZjAOmKFrzo4Mo/uGaLZeFlAfmBzm4v+rE9gbqXPhOx8BXH3+EryI=@vger.kernel.org X-Gm-Message-State: AOJu0YyETuQBSi6lffeuX8B8F1nWqfaUBdmQWX8Q7nPVee69wCuTpOPI eoyEkOj3/owzWbg0D84tD/iV7c3xhWP35JUZiN15SS121gVcoC7GO+/lvK4c/OY= X-Gm-Gg: ASbGnctnucVS2/uB2IKOuhu6qwQDeLyEXQ3E/1QUIGn025iwKHAiRZPE1JNx9MCJIKa jYN7/kghVGrUKzkLuzvQ3xYalQgpy1DwIU3GqYfafEwHzdGuSylw18lcOcMotvlpdE/WU3J9GhD CUYqsAjVDbSmFqaU6F8BN8nGCIZ1/9o6ebuUW1nLlg4t4KsC8HV3TAL2JHYtW6lS3FJcltfU2+R QLZEF0uwhnjZh58EPfP620KYNer0f3mBvcxclIpXgwQYojOpSXsjFTF0hKIc925yt0LEogv0wi7 EYTl+EmBOodXAPxa9PBoe+pzDlgUBrA/jJPFQ1Mr/omCiiHAAIqyK+w05WhETVzIqOFt4S4VCfm 4SSVxesVr57q7XdEU19g= X-Google-Smtp-Source: AGHT+IFpyPZ8OHsunTdPUAhz3+hHZqpRzqB+uc+3KU0WeLI4qJr+CM3YEWcq/yPMOmAPEzlWQ4DAbw== X-Received: by 2002:a5d:588f:0:b0:390:f394:6274 with SMTP id ffacd0b85a97d-39132da9214mr5345868f8f.52.1741475448065; Sat, 08 Mar 2025 15:10:48 -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-3912bfb79fbsm10297840f8f.13.2025.03.08.15.10.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 15/21] hw/vfio/pci: Check CONFIG_IOMMUFD at runtime using iommufd_builtin() Date: Sun, 9 Mar 2025 00:09:11 +0100 Message-ID: <20250308230917.18907-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the compile time check on the CONFIG_IOMMUFD definition by a runtime one by calling iommufd_builtin(). Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/pci.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 9872884ff8a..e83252766d1 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include @@ -2973,11 +2972,10 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) if (!(~vdev->host.domain || ~vdev->host.bus || ~vdev->host.slot || ~vdev->host.function)) { error_setg(errp, "No provided host device"); - error_append_hint(errp, "Use -device vfio-pci,host=DDDD:BB:DD.F " -#ifdef CONFIG_IOMMUFD - "or -device vfio-pci,fd=DEVICE_FD " -#endif - "or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\n"); + error_append_hint(errp, "Use -device vfio-pci,host=DDDD:BB:DD.F %s" + "or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\n", + iommufd_builtin() + ? "or -device vfio-pci,fd=DEVICE_FD " : ""); return; } vbasedev->sysfsdev = @@ -3412,19 +3410,18 @@ static const Property vfio_pci_dev_properties[] = { qdev_prop_nv_gpudirect_clique, uint8_t), DEFINE_PROP_OFF_AUTO_PCIBAR("x-msix-relocation", VFIOPCIDevice, msix_relo, OFF_AUTO_PCIBAR_OFF), -#ifdef CONFIG_IOMMUFD - DEFINE_PROP_LINK("iommufd", VFIOPCIDevice, vbasedev.iommufd, - TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif DEFINE_PROP_BOOL("skip-vsc-check", VFIOPCIDevice, skip_vsc_check, true), }; -#ifdef CONFIG_IOMMUFD +static const Property vfio_pci_dev_iommufd_properties[] = { + DEFINE_PROP_LINK("iommufd", VFIOPCIDevice, vbasedev.iommufd, + TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), +}; + static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp) { vfio_device_set_fd(&VFIO_PCI(obj)->vbasedev, str, errp); } -#endif static void vfio_pci_dev_class_init(ObjectClass *klass, void *data) { @@ -3433,9 +3430,10 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, void *data) device_class_set_legacy_reset(dc, vfio_pci_reset); device_class_set_props(dc, vfio_pci_dev_properties); -#ifdef CONFIG_IOMMUFD - object_class_property_add_str(klass, "fd", NULL, vfio_pci_set_fd); -#endif + if (iommufd_builtin()) { + device_class_set_props(dc, vfio_pci_dev_iommufd_properties); + object_class_property_add_str(klass, "fd", NULL, vfio_pci_set_fd); + } dc->desc = "VFIO-based PCI device assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); pdc->realize = vfio_realize; @@ -3540,11 +3538,11 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, void *data) "vf-token", "Specify UUID VF token. Required for VF when PF is owned " "by another VFIO driver"); -#ifdef CONFIG_IOMMUFD - object_class_property_set_description(klass, /* 9.0 */ - "iommufd", - "Set host IOMMUFD backend device"); -#endif + if (iommufd_builtin()) { + object_class_property_set_description(klass, /* 9.0 */ + "iommufd", + "Set host IOMMUFD backend device"); + } object_class_property_set_description(klass, /* 9.1 */ "x-device-dirty-page-tracking", "Disable device dirty page tracking and use " From patchwork Sat Mar 8 23:09:12 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: 14007984 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE89F1B5ED1 for ; Sat, 8 Mar 2025 23:10:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475457; cv=none; b=LKzdjav/pUQSEV547qF8U7mDJzDjdpqtU6V9H9MNDe4YEusSZN/nmto0yk+AMfhjuhLTyXWlSCGsROx1G7K2o2EMrnFXlHjQTaqVjhYJ2NyfjdU/XVmK1NucyjCwHZVCg9UUJlBeOYxv3EV2t2cx0ntbNfxhOXmxCutggsLbH48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475457; c=relaxed/simple; bh=yQSGyZpIkXMWlGV4oPCqW/y03LTQBYwnsYVY3D2IjqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MI+e55AIaDA/zITs5Mw40PPwiaxP1gF1VyeqJV+f0fpS9DYuX3p4dE8uQ1r8lgLtqGzGKSMDZIqnQgmKXE2Lh/ygIUTyqfNHTlEIuc9lSPICXiObBh4sb7HhRveNH1SfQe2Ydw8QaRWrUuUfeJCZ3H0h1COqhg+0cqukeEe0YEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=NfOSC7P5; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NfOSC7P5" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43bcbdf79cdso18044915e9.2 for ; Sat, 08 Mar 2025 15:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475454; x=1742080254; darn=vger.kernel.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=9I5vCsA50Nsuo6JWWElDKwuAuqANWG3nhtm6Mug0ADk=; b=NfOSC7P5HggymY6pnNEXJK3vMFEnx1r2dmJnkXSDbVt+bXHLsdyti+7ldaTF1QoQuH IlDFW3wJfTLvsM4Xfccx/YrGA58VWNquaKH7xzK9+ErNmkxk5QLoaNJtXGjPdL9zhabS HWd4FHHGPYEEO64EgbXm0LDvSfKJgEdlgW4u3785SwJbpaR83US8F+nNWCYBgT8/fp3n D3Y7XbiPDDGdsdmZzZeqR3BPhhtGckXam30wdiOe7pNwX1mBsTdGWWVuv/oAcByoqJaY NSfwt6i22LFoyQRyjl36vj42PyhC1yL9AyaojJRQXqUTAk0A3MbwdgBDXlKiQ9t7w1iF qBSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475454; x=1742080254; 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=9I5vCsA50Nsuo6JWWElDKwuAuqANWG3nhtm6Mug0ADk=; b=HUgFNNGCAvpL94fwljGEluKIt8euCpk2UxRADRfj3tYPcwWAfe9gJQeDQ1BLcenTGZ gHaH/PamJZmbRBqwU1S9AJ+4ErZYN0h+UlkdGCCV5zvDcK14zRqmpyowYcz4OMyyydS/ Ru3rS4yFvXK87LmQ5MvobXL50PPFYnNPBdCRIfXZKji+9AePRycO8qD2z9Id/UpxPq/I zJ476lyAe4VXw0J8eCR4gSCv8SbEO368vOEKHwg3R9BUMYn5k45xZNiiBYfTRJ0lPEfp 833+GQFApHMUx4BP6yQkeLm/wiJ/bABfcBvYA0g9K2oBQs4LechEKzehC00IuacDZq9H vGZw== X-Forwarded-Encrypted: i=1; AJvYcCVgNM0x+V5Vj1axNRtHIzZ9w7Xxofuv0U7WPQqIlLBPjm1pfLxbvrKn2ht/weX3/SV0bbo=@vger.kernel.org X-Gm-Message-State: AOJu0YxDsD1nW78SHnvJqfG82Xk4Wf0MSrn5mDokqYmAA4E2Tist+nF/ 5+LyderlY6mSjdIl8wOqvnBNZfX3yBGTIILiabSDoE7Wdv6w2E9gp+jhvcuVN9w= X-Gm-Gg: ASbGnctaelyJbBxSlY37ZZcw5wiY/Ns6ttx9pX46Zjdq7nzWplksOk9+sdqPuaz5L3C y1HVicwxa0pSo8V5FkNJ18/EOiz+Mb8DEuwcdgFxbOYzafwp3PsM+1m2xlZzE2lXHAygejUmlhB m9YUv1usr+dOggqR7F0awEtsSrhhMo7ytujNVOzXzONWRF5eENU08Co7ia1BKU5ZetsICwj7x5Z 6y8pnFF1DarY4ZumWouXiN7GCLSUvJSzJRgoGPyvPxhZQYDJaZBnHtQr+eRsYSCAF6A/QAJ8jxa nDUb8v1yWuI6e5IgSv5LVClGstvmD+EnM9GgERm6dG3UyFMum3vslC/i9VcmexFZVlvhFVIfTvD rHpWPCi+UPsiT+eRlVJs= X-Google-Smtp-Source: AGHT+IHD4U1Jg2eYVlde+YIZ+P/aR73Oxp+dN6sVG7EKlH8IIyBuRl1arvaQ7vamgw7TSdQkmdXYog== X-Received: by 2002:a05:600c:4e8e:b0:43b:cc3c:60bc with SMTP id 5b1f17b1804b1-43c5a60ed21mr56361295e9.15.1741475454020; Sat, 08 Mar 2025 15:10:54 -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-3912c01d2cdsm10234876f8f.57.2025.03.08.15.10.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 16/21] hw/vfio/pci: Compile once Date: Sun, 9 Mar 2025 00:09:12 +0100 Message-ID: <20250308230917.18907-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since the files don't use any target-specific knowledge anymore, move them to system_ss[] to build them once. Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 21c9cd6d2eb..ff9bd4f2e35 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,10 +4,6 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( - 'pci-quirks.c', - 'pci.c', -)) vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) @@ -33,4 +29,6 @@ system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( )) system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', + 'pci.c', + 'pci-quirks.c', )) From patchwork Sat Mar 8 23:09:13 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: 14007985 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8B27C2FA for ; Sat, 8 Mar 2025 23:11:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475462; cv=none; b=FxhDeTtF51bQdN4BPg/dAzw8cHVRtXwr2+8U/ciP/zyZRx6AI/p7fEQUPn9Uph2wlpEME9S7p8oupjYeV6xtEfls9xbcOEftQV2iCl7x5cujekpyFJE/t1MDhxksJCwp4t1UsBBnuzvRQJtfvlHhhf5xBnTDuELdrngwXCam2iI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475462; c=relaxed/simple; bh=I5mIKYcrbyUHvfM9+OPuCpKvUF94WRLAFqLK6WZJsXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZrmJLZDj8TDOuK8780UC1bUYCvkq4yab6KXVJbqvn/ImdpORijGqkgE5IRmh/DP9zhvMg6DTmh/pSMiKEnRJZfbXDOI++IfNk9DFh68XWZLYmaTn38iCZCSvYH0Mn7yAKeLLpk7Z33daimVqJitOitXu9K9htSV0N02Y863a3S8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=VmuZ/rZX; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VmuZ/rZX" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3913d129c1aso403084f8f.0 for ; Sat, 08 Mar 2025 15:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475459; x=1742080259; darn=vger.kernel.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=9qGswFlRD0j2khHR7PT2I53zcxF8+u37OT/9BiqIPFA=; b=VmuZ/rZX9XfuAsir3hp1sIddHGPIxh902gi2HIEwj44sWnVWjHNxMnm7ON6q7M3DtV Oa8f37biC/wf74rWdpAK0knGgzZR1QzNXJk12Xqep9KG7DkK0evpYqdYPcMgbqpqZjOr rs2tuS2I3rDPhdz8ZtEKp9PpqlotdUDP5G0eRi78yXpnKO48qA+il3b4icctXDC1o1lP d7R9ePGzLIDJPOYH9F2LrGTRbPqhMcUDjwKn+TyVSFpOzjB2FLw4OYd5FcDs/GIYfzYg 3h2Md9hywyGsxsXCz1WycJjJ2cTLIWbz7olAoBcC2/rZcZayxZjdQWfh//VnMqiUcuRL nC+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475459; x=1742080259; 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=9qGswFlRD0j2khHR7PT2I53zcxF8+u37OT/9BiqIPFA=; b=Qy8SsBprNXfh6gxjofpC8CqsK+5SLMAsaFpR4vpU0kyS9ldu5CgWGzwh+89Owfi/34 I16Bu7EWnQaRgSGxB48TZqYfLTcSrduRIi9DtOjS1EwHODchPMaKPfFciZnYQZn8T9Rm iKZNHfDFLPHarX5TnuHvZNEpTq3q7XklROW578YT5VANvu6d0HaEJeF5GgSoJ6p5u6YK mfVU4vhSLScY8uZhwslgTSDbFh9OJs7hlibaqbnlsBJ3u41eX3N5oH3RqBtxlGH0VSie 3lGpIH9jSMVbf4kRwQVabetAqlbsM3NS0RMInoBGkx5lwdiqnCEqyih3L07IoH4vWcqc i8tA== X-Forwarded-Encrypted: i=1; AJvYcCXmSitCoOB1Vrv8KNiZbtxOn3l9Yr/uhl5DqGfgf+ylvRbipZMIjAPVowPH4qN/sAJpp5A=@vger.kernel.org X-Gm-Message-State: AOJu0YwDGS+8/5J7HVuBDyRhNj60cxNLvSPY24VqrgRnP/l2rtvxd35o 2jdy66x2UTLRCC+gK1jWmiYIrhCdkEmf8dqvpJStlbntOlsXNdECWvWqR6HdeEo= X-Gm-Gg: ASbGncsAYrt/VK2kUp5Jkbdxea5dQknnNnTT+UToQX2yXRufSBuLYbw4Pb5sfz4enKf uveNkOfQkAoNvrifPwU0GW/Yn8wzMhd37927Iy74eIeLcTLHK/ad8Pfy2EFdP8Kwkk1pkZEn4py MhPhTPWKuZSMKp4y/8FxgRo8d0XaqXU/UPmDuISEXb3RKuGGBvGdk4LgwHgrBz8O5eyAbIaBPgU vBQ9G0zSXRzPFnHgzLI/mR1tmZ8INE0cZDuzyWdflj/x4JkzxCF1+pbEeRI+XWNSQD/0KGN/Dmo 4flCWaSo0ckRbpFE01lrHdZO2A+zpUitGtTiQuCVGWTqBm5SOkBe2z5CJ4JQ3jRZoJjZAgS1gBT vg7T5cRV6eEKUrln3XTU= X-Google-Smtp-Source: AGHT+IEbpDTd0sPomjcJ6hoJScZQbmBmzr2wv56KE84rBFKzKYjSy1/YKGyelEMd+2MRWVmS4KkUgA== X-Received: by 2002:a5d:584f:0:b0:391:1218:d5f4 with SMTP id ffacd0b85a97d-3913af39bccmr2283871f8f.23.1741475459232; Sat, 08 Mar 2025 15:10:59 -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-3912bfdff72sm10254923f8f.36.2025.03.08.15.10.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:10:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 17/21] hw/vfio/ap: Check CONFIG_IOMMUFD at runtime using iommufd_builtin() Date: Sun, 9 Mar 2025 00:09:13 +0100 Message-ID: <20250308230917.18907-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the compile time check on the CONFIG_IOMMUFD definition by a runtime one by calling iommufd_builtin(). Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/ap.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index c7ab4ff57ad..a4ec2b5f9ac 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include #include "qapi/error.h" @@ -193,10 +192,11 @@ static void vfio_ap_unrealize(DeviceState *dev) static const Property vfio_ap_properties[] = { DEFINE_PROP_STRING("sysfsdev", VFIOAPDevice, vdev.sysfsdev), -#ifdef CONFIG_IOMMUFD +}; + +static const Property vfio_ap_iommufd_properties[] = { DEFINE_PROP_LINK("iommufd", VFIOAPDevice, vdev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif }; static void vfio_ap_reset(DeviceState *dev) @@ -234,21 +234,20 @@ static void vfio_ap_instance_init(Object *obj) vbasedev->mdev = true; } -#ifdef CONFIG_IOMMUFD static void vfio_ap_set_fd(Object *obj, const char *str, Error **errp) { vfio_device_set_fd(&VFIO_AP_DEVICE(obj)->vdev, str, errp); } -#endif static void vfio_ap_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); device_class_set_props(dc, vfio_ap_properties); -#ifdef CONFIG_IOMMUFD - object_class_property_add_str(klass, "fd", NULL, vfio_ap_set_fd); -#endif + if (iommufd_builtin()) { + device_class_set_props(dc, vfio_ap_iommufd_properties); + object_class_property_add_str(klass, "fd", NULL, vfio_ap_set_fd); + } dc->vmsd = &vfio_ap_vmstate; dc->desc = "VFIO-based AP device assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -261,11 +260,11 @@ static void vfio_ap_class_init(ObjectClass *klass, void *data) object_class_property_set_description(klass, /* 3.1 */ "sysfsdev", "Host sysfs path of assigned device"); -#ifdef CONFIG_IOMMUFD - object_class_property_set_description(klass, /* 9.0 */ - "iommufd", - "Set host IOMMUFD backend device"); -#endif + if (iommufd_builtin()) { + object_class_property_set_description(klass, /* 9.0 */ + "iommufd", + "Set host IOMMUFD backend device"); + } } static const TypeInfo vfio_ap_info = { From patchwork Sat Mar 8 23:09:14 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: 14007986 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 147E41B425C for ; Sat, 8 Mar 2025 23:11:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475467; cv=none; b=XpphMQ9YDra/TSMFEZLcTszxVxI7sjsQWgpRd+p1JsuDZjHeb3rVLBdhV40VlwAD0zpyply4wsQQwvoGCzkm1CWLXM27qb2kImXBONkvCiWUk6LbWjufBCBFwWUy+5A8tuBbDRqH4h2HzaSPv2J5ozLH3Wtj0XlVA69VKuea1ZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475467; c=relaxed/simple; bh=/xJoMUA1bbz7x7HDB3B/t2WxKBtWlxcELzk39ZA2w6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fmV2hYa2EpdTKM3dXuHWjrxy1L/aXp4YVVMZQ1ugRQNuy9hQL5oXMxiraGuNEKj8NW27Ie7tmpOLtQzX4ePSPOkPffprqOc+xfQ3be9chVLsJrzimvSzVnwO2ynZgX1QxCQ2Zx1kXoFjYuX1G6dFK9IlWCVQMxARGHpLobQtBe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=LUR2pbxp; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="LUR2pbxp" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso32737825e9.1 for ; Sat, 08 Mar 2025 15:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475464; x=1742080264; darn=vger.kernel.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=xZOLi7hVFZ5LkXmaV+OYfUEhNf7zzYjD6/tmTvULQjs=; b=LUR2pbxpjLSwbQZyo9xHninBP69u3yh5HI8ojYtWbqDwRtUeAWKqN1yBATKNWnDSI2 zmebExxQUTp/3I7AFqNyo3tgG5jbDBRKBUSYSQhSYKXzaL6PG8HM+niJA8b/Gw2lSLCS r3nCh85pMjX/w56ua3BorVLtvovh3fVlk0s0r+HSoQCW3PH8rKdTH0F9cAIl6zSIoQc2 3akNpRLhVT4pPBbFlJYdhy0PPs1krjqjJ3HP5MvgT5XwNnhEabSdBREQJfXv6BD/cwEw YOpKZyTbxFqK3a2OQ49WOMLhyZrpbZ8v00F2L3zD/1/hFsq31EGpvlMXBGhy2vsXQ4eo HkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475464; x=1742080264; 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=xZOLi7hVFZ5LkXmaV+OYfUEhNf7zzYjD6/tmTvULQjs=; b=KU0IFSV3/MJ7wdbqgAHRffEA4Th6HuEObPRTUeLky+PbsnzEmTR3/Ta5S44wOpx3pN iSjiM2f62prbeGr3jiy3/uSVTokt+SGVnQ555Oxi7zICPwgHtvVcnQdBMrrHif1DfUeE VyCb2DBsFbv92J2hUTG+jpDoLKvuJM+wcVJqgVdK75wVtyFsJUqFbqHPxYuM/NBGPwor +aH7inMay1/kjnoB6SN3mfxTv7+4Glm/AHX+tJgVTRdAHIytitTv5qK11X9mYyq7cHaV cDOdmFqWdwmYPMiceN5GYMY7w97gSH+Pt2WNJCyHwwDsFlKvsDRKNR5FUMvoGeky+AkT 6ECA== X-Forwarded-Encrypted: i=1; AJvYcCXssBHwCU+Jd35eBw0K+SG8v3ubuGBwIglQUZ8LZn9oaNnGcNUU4K67FPfKtJQNoRA1fVY=@vger.kernel.org X-Gm-Message-State: AOJu0YzV/PHYCkkFxYNJ/GHADdS+FSkWbeOB5nU+QRNIP/7R9bXwavI5 SH5rbo2Sw9ps8ZL4Eg1cjZbY72MWuibiM8pYYXXKib6cHoyizoIfUxROM+hW2Xk= X-Gm-Gg: ASbGncsZ0Y95SyNjRsCq3FN6fOncdHl2MKPm49kFMwrTtuq6uZeABSJhCJCCxKS9PBk s64JpSorFur83JK4RFEuiUAzYnpqYu5SH4uJfnuSKmBfEavQxjbUaDgT91GscfStMFBHQP5jrgD +rtLMLId1RgogNrMYp3y5E3FkDeoh/HTE2tkU+75lWIj9lAANRBQrJ8ibhi58SjfIIPQU7X1ebr sQJ2ddCLUdWvUcuWQwUkmWAVApWWeInnKc+KJaaEBvYMMLTo85Rsc2pzKuBJZM18Y+/9es7+z0b huOTYKgJ3dEpkxOcXrP4T0aKjQ6trShOSlALT85tZOu917nZH4I//ry8XfhhVT6dAuQfkprz4QQ x/YduFMnkskuc3NhE4TM= X-Google-Smtp-Source: AGHT+IGWy1gJ5oJ0bHv2ZZjJsgicnzsIu9r/rWofhhX1E8f5N83B9uErX1SevbWarzZRQU5Rb4Xxww== X-Received: by 2002:a05:600c:1c03:b0:439:9106:c09 with SMTP id 5b1f17b1804b1-43c6021f124mr55430515e9.26.1741475464444; Sat, 08 Mar 2025 15:11:04 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd4352eccsm126209355e9.27.2025.03.08.15.11.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:11:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 18/21] hw/vfio/ccw: Check CONFIG_IOMMUFD at runtime using iommufd_builtin() Date: Sun, 9 Mar 2025 00:09:14 +0100 Message-ID: <20250308230917.18907-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the compile time check on the CONFIG_IOMMUFD definition by a runtime one by calling iommufd_builtin(). Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/ccw.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index e5e0d9e3e7e..84d1437a568 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include #include @@ -650,11 +649,12 @@ static void vfio_ccw_unrealize(DeviceState *dev) static const Property vfio_ccw_properties[] = { DEFINE_PROP_STRING("sysfsdev", VFIOCCWDevice, vdev.sysfsdev), DEFINE_PROP_BOOL("force-orb-pfch", VFIOCCWDevice, force_orb_pfch, false), -#ifdef CONFIG_IOMMUFD + DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), +}; + +static const Property vfio_ccw_iommufd_properties[] = { DEFINE_PROP_LINK("iommufd", VFIOCCWDevice, vdev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif - DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), }; static const VMStateDescription vfio_ccw_vmstate = { @@ -682,12 +682,10 @@ static void vfio_ccw_instance_init(Object *obj) DEVICE(vcdev), true); } -#ifdef CONFIG_IOMMUFD static void vfio_ccw_set_fd(Object *obj, const char *str, Error **errp) { vfio_device_set_fd(&VFIO_CCW(obj)->vdev, str, errp); } -#endif static void vfio_ccw_class_init(ObjectClass *klass, void *data) { @@ -695,9 +693,10 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data) S390CCWDeviceClass *cdc = S390_CCW_DEVICE_CLASS(klass); device_class_set_props(dc, vfio_ccw_properties); -#ifdef CONFIG_IOMMUFD - object_class_property_add_str(klass, "fd", NULL, vfio_ccw_set_fd); -#endif + if (iommufd_builtin()) { + device_class_set_props(dc, vfio_ccw_iommufd_properties); + object_class_property_add_str(klass, "fd", NULL, vfio_ccw_set_fd); + } dc->vmsd = &vfio_ccw_vmstate; dc->desc = "VFIO-based subchannel assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -716,11 +715,11 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data) object_class_property_set_description(klass, /* 3.0 */ "force-orb-pfch", "Force unlimited prefetch"); -#ifdef CONFIG_IOMMUFD - object_class_property_set_description(klass, /* 9.0 */ - "iommufd", - "Set host IOMMUFD backend device"); -#endif + if (iommufd_builtin()) { + object_class_property_set_description(klass, /* 9.0 */ + "iommufd", + "Set host IOMMUFD backend device"); + } object_class_property_set_description(klass, /* 9.2 */ "loadparm", "Define which devices that can be used for booting"); From patchwork Sat Mar 8 23:09:15 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: 14007987 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13C4217C77 for ; Sat, 8 Mar 2025 23:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475473; cv=none; b=XNN6AKrsqoxGqpKiergmuVhxcRVEOedrujofI4CJYnJzPYaqPBlaiVBcL6RjmV0oTgJfCElzDXKB7InBmJYlsOUK7PzIaFchdG8gfEFWVhjIUJcEoJOHSOUvZFmKtsbHs2e2+/XhordRi529uqS8JnsgpYP3mGyDgVQMXYdAxqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475473; c=relaxed/simple; bh=wAy5ej7XHY90ux45qXW7oKSQt3NI/TDRCxR+k/DH8j0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ITo7jSCagloXlPuoPydBu/+AHzQxNGMC08qQC+FzkcLIAGYt1uh1ziBDtuwV8Y0Nv3wGjrB2iqq7tfwIW/TvYp/uhWnrivwDoG8a6uXMzPSWiGtzwTf5kYCW9RCEW15hwar2kM8uw5HDzlCQ5MHNo1K5dwR8X+KXN08gT/R9C2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ON1EZGP7; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ON1EZGP7" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43bccfa7b89so25637275e9.2 for ; Sat, 08 Mar 2025 15:11:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475470; x=1742080270; darn=vger.kernel.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=SchAlroLdDNdcNXpi1x0hC/CnniZL26bHHU3ofZkp5E=; b=ON1EZGP7VY8C1uASrTSl5ZCjHCpWM54oqImBljM4Pslc8W1mDmGtWGIPFQcbfs6dy3 8/1vcY0EujSiuUbwR3oRM/hpHPhOMXYKtw33ZgIHGQGXeZu9/qGxJhI992kW4Li9B4/D BUnowQ1LKh8TZ50o+vUskEwKm55lQQmSuxnUAGPIiJAA0o2uk/A3yISyodzl1R1aMQuo KzhegnACQ+cZBaOBQzYyik210fXQS524X+ZJR7QZX6pH7X8VecYugl80PQGevr1xskfn tXUzgBrrcSHIsmnW8Dntzml6wTV5rY/8sXyBTYiWydItAFKHR/2Fl8ihl1vOYs6EX6mS YQuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475470; x=1742080270; 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=SchAlroLdDNdcNXpi1x0hC/CnniZL26bHHU3ofZkp5E=; b=w+/eBo/wWsAaioG2S44rhot8C3uoeniQ/5Qa70vWNMtQoNGVAmIodIWZ6h03xxyGrK txIei31ZuEbvoFRyA/+zCTFHwOHBSX/b5n9RX+GZGOsVI1u9erAy3tl/bkqEUqoMgfP7 wjD/RQH4AeLaYBPm/udbkQn+UCyLrnAv8hySexcvAkZA8n53ufBmC6ZbZfN/9Ky2T9w3 x6jfG2bETDWdgwfIkM3dn1rSG1ybT6Vv1JUHH66Er0Qc88t7ZpWFoEqtsBHLfksgFM+5 WkN5qdnJkHoh/HTI2VdL3cjgzYJ30QJpCpQiOaNlTB8MXkI/4cQAQpS8HWMPNRjS+p9S EiAA== X-Forwarded-Encrypted: i=1; AJvYcCX6Wwr2aDvTGkbwebV/89r7m9w3BIyovio7lNqvmSaL3G3z02TJjIPxDPJjYd7DobZYFXs=@vger.kernel.org X-Gm-Message-State: AOJu0YzqpQOSFsKqaJGjVNQpY/U8tdOWYQ+gyxoAWOd9mORyQuRbd02B 48p+Zb0fbQ5jCWkabCNC9rguIEgrLDPqW3GuuY7ATKRGbsoQNXVRZjmpeUjd20M= X-Gm-Gg: ASbGnctJHVYar3FnPfaWYPa80lOZZneP+bZB2/dC5Z0F3+RTEQIWKMKr8WsqJ3RA1zd Id0BNlPbgnWbPBS72GwiRgKqStSWZQV8wtd4MhTMUA+QaL5YI9g3oIOtkj+KvmrobiaRY/b1FFA 7ZhhtQ0mmiHLnMefL7BrIbHHmzHP2uRyfbUuBysSG8W1Seq6pFW98IAF6slbV4L3zmOJB96okeD 6moJd8PQMhK6F4KBD+fu44wD04aw7WUeqI4WElxPhKJeJuEwnNjr+Zc3eA2+QOFZAdKxc09Norz 0nVawigdXEpdQRyQNaLBkoO9ULL8Kob0oRfBaIgF1RHRZFvaDHGHoAoRFx5IbAygy56t7JdRDqE P2FOX4aeKcHRFIxVrff0= X-Google-Smtp-Source: AGHT+IEb/b4LOE2Bgus21ZYrnM3VVzkRV4FDIHRDZ5Yi+DfrCk1Fa3EmoxdciYSS3mQYlPYdKzgUqA== X-Received: by 2002:a05:600c:4e89:b0:43b:c448:bc34 with SMTP id 5b1f17b1804b1-43c601d0758mr55299595e9.18.1741475470398; Sat, 08 Mar 2025 15:11:10 -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-3912c0e4065sm10261640f8f.62.2025.03.08.15.11.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:11:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 19/21] hw/vfio/s390x: Compile AP and CCW once Date: Sun, 9 Mar 2025 00:09:15 +0100 Message-ID: <20250308230917.18907-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since the files don't use any target-specific knowledge anymore, move them to system_ss[] to build them once, even if they are only used for one unique binary (qemu-system-s390x). Because files in system_ss[] don't get the target/foo/ path in their CPPFLAGS, use header paths relative to the root directory. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/kvm/kvm_s390x.h | 2 +- hw/vfio/ap.c | 2 +- hw/vfio/meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h index 649dae5948a..7b1cce3e60d 100644 --- a/target/s390x/kvm/kvm_s390x.h +++ b/target/s390x/kvm/kvm_s390x.h @@ -10,7 +10,7 @@ #ifndef KVM_S390X_H #define KVM_S390X_H -#include "cpu-qom.h" +#include "target/s390x/cpu-qom.h" struct kvm_s390_irq; diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index a4ec2b5f9ac..832b98532ea 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "kvm/kvm_s390x.h" +#include "target/s390x/kvm/kvm_s390x.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" #include "hw/s390x/ap-bridge.h" diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index ff9bd4f2e35..3119c841ed9 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,9 +4,7 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) -vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) @@ -27,6 +25,8 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( 'iommufd.c', )) +system_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) +system_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', 'pci.c', From patchwork Sat Mar 8 23:09:16 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: 14008002 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E0271B425C for ; Sat, 8 Mar 2025 23:11:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475480; cv=none; b=nAoPjHIDoohrh9NHVxUiAntmKyvntr2ZeRk8ywoxemR8BQNODWt3RyVLn8GTuRbPB9o5OCgPh4gds6bkmYsu+5gioGE7VSw/Rf6/DfCJGGG4mwEdiZnWproa4L47uXLZTgNbMA1lQGyGbvN8cXHFOgUtWoMbZl8L6UOlvd/JV5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475480; c=relaxed/simple; bh=kCDVBnaQXpr96aoyJNh6o7fs39YPEXMlsX+H5eJpYZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ddxtVoe7uZAzqcmzomntQyiJyNSfNYLFaJdFX1Wb52Dm3faY76o+zIQ1muU5VIz+YrtgcOO8YJR3heiV26hiZ/crUWaCRjUtYlnMEFi8vSOvemg9VddV3/Qy7LrPkHpOv1bhF1oESx5t10w2z4dNTX+Z+CPrm6BY6U1KF/6ca78= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SXwzliMa; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SXwzliMa" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso2476102f8f.2 for ; Sat, 08 Mar 2025 15:11:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475476; x=1742080276; darn=vger.kernel.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=Krkj4W9PXI2bbr9HKRBnaek4mFUNomZTUnghoZDAa+8=; b=SXwzliMauA9PyQc3dE6BWjuIePDikaELuOCrlHA+vVDE58x9q55PMFXXkwVwdZ7K2/ 16XL+/ioj4j23Cp3MesWFB2w+LrvtnekCzloPrMOCSEPpjM5G1ScCo5E4E1fh2Dwc+9j GYUuhizvGN/LS7i/euRgNP0C/Tj4yh5/cR3GdlQM1qQt7NaOAiJKTUiAcdY4wgQvl8lW b3ZgB5flbG9D4/vCXT9cacaaLcjcO+cTy//460GeJLK/rfRDGzJwEnaaye6Y18mXIIUJ DfZtNh045zfol+BM3O9FOhDlvS7FQ7KrmdtK+J4kG1yKWCm7/H8vbK6g+J/QrGbJjt4Q jpYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475476; x=1742080276; 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=Krkj4W9PXI2bbr9HKRBnaek4mFUNomZTUnghoZDAa+8=; b=c3vpQ/AbIWhKiPyL97xmNDKlQJ5tZYQfmME0/mt3CTR8MbP5MRwnJYqbXRi79aCRzw j3jbCGc6el+TzaR8W5SCdN0Qks6/fY48BI9XYXzFIOcECVGXyw/0yzs1o4iOjrOY6WtK X7EYzqhlOi+Us4gARbUVHEAQVAFVERL20MZZ7gu/0Bx0SHskuIeIvP+Re4Yk07si5EYx c+v6mHUzxDLsYdtT0zMv4/o++UT7SLlUvhLf1TBChY+9eNbcl1XYrK4bOgwKfraJ0Byl 6ofi37UwzzVMsjAwqedg/dUbEXOjUEwXS+0Grj4UinkDIGPUJ6q7Tq1hO4zWR0r3yIKd Qclw== X-Forwarded-Encrypted: i=1; AJvYcCUGK6rUwEzln4sF5Aok+cph9QIkHJg5NVTMAgfqvhRg5kOLXmrzH3WR0PumO/tA6EpPMvg=@vger.kernel.org X-Gm-Message-State: AOJu0YyCTtOoHAMNgqHI8bDo0vLJum0scpOP8R4nsjHCQ2BSh8gQQmif YwpC5WdivfEaGIcNvRAmnd1jo2ClsDw+kWLmErccsXjyiS1E5Z8HpFIpb7KnI5M= X-Gm-Gg: ASbGncv0efaFaxdOi3B49Rv4R3VNX1QPQMuYG+e8LBlJWVhlp4T3zbeJ4W0G8/9EsKm yxICBu7oMWBGDjdnmqtKANKOVb4i/EhNn6dk96WzHXg+K9rNTpEwGyDzOsD5K+GK/HGzq8tgtq3 NnsoRgkAwUH+F2iRktF5SZJWxHnNxYGRbxHAlEdMfKupbiWHf7m1JxEM3Zr+jZnSQdCtaWwZZAJ dIM0/ZEdKz7Dh6BtIhyzJuQzSWaaf8S/lX2FeQg4QDgFwxCW6pSB0DtoFti1FZwSNc6/qAfqUYW lw6ZjdH42kOq75owZrTcYr1gPxO/t44+o9vM8UC85J0+RmdKvelFNNfYOcH9SLSH1ltsoQj6Eio cbwvUDIeoQQLT7RFS9MQ= X-Google-Smtp-Source: AGHT+IEi5WAhR9L6pJSrF/tDnKMBfesHPV2+gJAeMrFmEGRf8Nfb1OcWHH46hcW/pc42V1sIDxqOTg== X-Received: by 2002:a5d:598f:0:b0:391:412b:e22b with SMTP id ffacd0b85a97d-391412be5e4mr1168437f8f.18.1741475476383; Sat, 08 Mar 2025 15:11:16 -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-3912c01de21sm10233750f8f.59.2025.03.08.15.11.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:11:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 20/21] hw/vfio/platform: Check CONFIG_IOMMUFD at runtime using iommufd_builtin Date: Sun, 9 Mar 2025 00:09:16 +0100 Message-ID: <20250308230917.18907-21-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the compile time check on the CONFIG_IOMMUFD definition by a runtime one by calling iommufd_builtin(). Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/platform.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 67bc57409c1..265c550b747 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include "qapi/error.h" #include #include @@ -637,10 +636,11 @@ static const Property vfio_platform_dev_properties[] = { DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice, mmap_timeout, 1100), DEFINE_PROP_BOOL("x-irqfd", VFIOPlatformDevice, irqfd_allowed, true), -#ifdef CONFIG_IOMMUFD +}; + +static const Property vfio_platform_dev_iommufd_properties[] = { DEFINE_PROP_LINK("iommufd", VFIOPlatformDevice, vbasedev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif }; static void vfio_platform_instance_init(Object *obj) @@ -652,12 +652,10 @@ static void vfio_platform_instance_init(Object *obj) DEVICE(vdev), false); } -#ifdef CONFIG_IOMMUFD static void vfio_platform_set_fd(Object *obj, const char *str, Error **errp) { vfio_device_set_fd(&VFIO_PLATFORM_DEVICE(obj)->vbasedev, str, errp); } -#endif static void vfio_platform_class_init(ObjectClass *klass, void *data) { @@ -666,9 +664,10 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data) dc->realize = vfio_platform_realize; device_class_set_props(dc, vfio_platform_dev_properties); -#ifdef CONFIG_IOMMUFD - object_class_property_add_str(klass, "fd", NULL, vfio_platform_set_fd); -#endif + if (iommufd_builtin()) { + device_class_set_props(dc, vfio_platform_dev_iommufd_properties); + object_class_property_add_str(klass, "fd", NULL, vfio_platform_set_fd); + } dc->vmsd = &vfio_platform_vmstate; dc->desc = "VFIO-based platform device assignment"; sbc->connect_irq_notifier = vfio_start_irqfd_injection; @@ -692,11 +691,11 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data) object_class_property_set_description(klass, /* 2.6 */ "sysfsdev", "Host sysfs path of assigned device"); -#ifdef CONFIG_IOMMUFD - object_class_property_set_description(klass, /* 9.0 */ - "iommufd", - "Set host IOMMUFD backend device"); -#endif + if (iommufd_builtin()) { + object_class_property_set_description(klass, /* 9.0 */ + "iommufd", + "Set host IOMMUFD backend device"); + } } static const TypeInfo vfio_platform_dev_info = { From patchwork Sat Mar 8 23:09:17 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: 14008003 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33AE217C77 for ; Sat, 8 Mar 2025 23:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475484; cv=none; b=inUo5X9Ra2XjcT1X1/2v5UV2vcM9SYdw8Fs6hogie823o6cHSaPxD00CFPXiMjowZNzEqdttXBFJdYDgMJdIeZG+ejGAINuOTl/YSOCWz8/5iD9u8BZhVbyACj2Ox5KWFnhmPJOPgJTfgtQLYolQmgqHTtqju5SnD3NqVNlCFBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741475484; c=relaxed/simple; bh=eDh3c+/Vj8jpKN0lbJP4pS05bBtQ7yp3s2/UePZ5ch4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Tn1iOxNxB4rw4YaJM6h9pqK//56yK06TgyWcZAyaYfdAyy2LmluoXKVlvJ1tTV3VK6qjHikuQfW64zMkcd9vvbZxgSPhHRguiQOZVyzlDcp8Xb6wufPW6CJU8zaY8YdB3puggS84euharF6o/uPAYE4yiF2bYvpPPvfx7qjWOLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=tmVsheW3; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tmVsheW3" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-39143200ddaso71944f8f.1 for ; Sat, 08 Mar 2025 15:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741475481; x=1742080281; darn=vger.kernel.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=prGg0Jp93h0bTm2Rvsy5eDeK3CFMwhrsFj/MryWjJGE=; b=tmVsheW3VH/Lqu71oEAkCxUnAGg5xKRrVQ8XpgzrH3NuWjr5kyYTWouMkIzOvrbwW/ HHoLa0+HkzrUb+WkNN+qjs+Huf6Ybh4x6Q9wHjYKfCmIMs9QnPSataKN43vT1Xro9dDv t0NVBwFQVPqfqlie9+uZJVN3waZXvFzfu5XKXAc7xeqS3RWPT7ceqfYkjJ6xDDZAzAUn I3GQtPrJl0BSyhAGr4yK4jyvBicFYqrXJSKwQliRIn31xITwo5npLzgLspgehBxbfEok yfpi+4mvxPADatajI/kF0cDhAOgSdDMdMuQRyRlyLgwo0c+vpKyupdjYeQ0W1Ykt9m2S bc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741475481; x=1742080281; 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=prGg0Jp93h0bTm2Rvsy5eDeK3CFMwhrsFj/MryWjJGE=; b=DcoSoGU7N/ImuBUIhY1JMR4akpx6mMXBGAEKyatkxPR49OFNkWQ9uSeTusTM7k089u KzBOpYgAKzP6o49R26W5ccoYQnrW4C0nqUTGEHsoYMwCA9ED7mOuaExMnuX8McXWqz1a IW+vtLF5iZuwxvPIJZPf+f08U2D0795fIrBOA4YPnr4qp7VTkytcqakwBvBZBnfZoAHE SxtTqyZyRkIKEdXeUuyTpRvcN87hiyrONKRBqmw0wqHp6eJlT07z4FqID8glKJcC05gQ m4GiyJ7vVTK6KNRRKmUfiEkMi/Y5JP3g2SI5zZ68LYn2VzQNHfTd7WpXMm32SS67jVwR Yqmw== X-Forwarded-Encrypted: i=1; AJvYcCUG13gm8IUQGEdkixdqxp67aLxYhGKg9lqNLp13GU8IjCidWzGqD44orkKqOrzhgmIYct8=@vger.kernel.org X-Gm-Message-State: AOJu0YyNKYOspLiWZlNrfKrXytbbPCa4Vr197V2HMUv2llOVKknoqCiu h3h32eF2c1t4IhQ6H7gbfTA7E6+/aJsDOtLuP8e0+vxhp4u+F9ef8FQ4D5mYQ+g= X-Gm-Gg: ASbGncsSV0idEgZZZjL3Y+XFOGR4QRvyX0mz7+D9ds67QrNOvQhVhSOBSgSL+HOTqDG AHdZpN42iedggwGZWs6A0F0nj3xCUwyBScsAE1ThK24gn89tql34OnLqB+3O5pJxFdWm9oLMS3i 5hqyxZugOxDNREKszNfgCiMBEg++oRQHz2UoaV9r+zpbxwbGmhx/G0rYlwRmT+UQfFNTDVehc1F ZhaS9QOxs54PsygU+XTNMVIBmGhrg97S/t5YzGN3FQTV/I8EmjyAceKqvpUkJG/0yqD9VFHLC7k md00BBxP4vFZncz1e/CJ5FP10yyCWI+gnbP7kKh7kjsGPgU6bMAjvsulqGuYCFQhTTXzXsRlNCm dDX4hhBkWmjbleSiwQ6c= X-Google-Smtp-Source: AGHT+IH0XSNDzdAllhDd7qyOz0D5nItYuKr/ugMkLxptVro68gJqgXVXVwkqEYkZomhnl6ZBZh9Tiw== X-Received: by 2002:a05:6000:178a:b0:38f:210b:693f with SMTP id ffacd0b85a97d-39132de1c59mr4682001f8f.52.1741475481571; Sat, 08 Mar 2025 15:11:21 -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-3912c01d81csm10221905f8f.58.2025.03.08.15.11.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 08 Mar 2025 15:11:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yi Liu , Pierrick Bouvier , Alex Williamson , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Tony Krowiak , Nicholas Piggin , Halil Pasic , Thomas Huth , David Hildenbrand , Igor Mammedov , Matthew Rosato , Tomita Moeko , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Eric Farman , Eduardo Habkost , Peter Xu , kvm@vger.kernel.org, Zhenzhong Duan , qemu-s390x@nongnu.org, Eric Auger , Paolo Bonzini , Harsh Prateek Bora , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Ilya Leoshkevich , Jason Herne , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 21/21] hw/vfio/platform: Compile once Date: Sun, 9 Mar 2025 00:09:17 +0100 Message-ID: <20250308230917.18907-22-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308230917.18907-1-philmd@linaro.org> References: <20250308230917.18907-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since the file doesn't use any target-specific knowledge anymore, move it to system_ss[] to build it once. Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 3119c841ed9..2bcbd052950 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -4,7 +4,6 @@ vfio_ss.add(files( 'container.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) -vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) @@ -27,6 +26,7 @@ system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( )) system_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) system_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) +system_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) system_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'display.c', 'pci.c',