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: 871639 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp349326wri; Sat, 8 Mar 2025 15:13:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVnitBYTVbkVPSDNlUvFzYq86BpQChlHwSRVfIih++O9HG0YO6Kc3dGqlCWtH9s4nXZdwD4eQ==@linaro.org X-Google-Smtp-Source: AGHT+IFmubUbRR3mjlK7CD8x8Ah/AYrCxzoV1zcuUJx6PVa/4/myZhc3hiA+aH48okCShCsFm/gR X-Received: by 2002:a05:622a:51:b0:475:8f2:a1be with SMTP id d75a77b69052e-47618af006emr110792991cf.48.1741475606057; Sat, 08 Mar 2025 15:13:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741475606; cv=none; d=google.com; s=arc-20240605; b=ai+Q77SKwsWF4FykuMZjttMNHS82w2fIvHiz7SaadNSZ/6eppN9yVAK9GBmCwmTOaF VgXxXN0tLUuQwwv+tPGkE7M0L3IDF46RtvdAASTOAaFneNwuD4PBxm+P0KUVzlPM39Sz dgMxtSVAjvg5vdtUIZ/oKcdLXzctowRazIARVlLc750zlOdQ8YRpaC5u0yfKEpUb9vNn D6M/Ae8rq9hUfWhwuqDC8vHu+ZHSDA/Ma+65/kR2/xVpZXoRy42cTgJ9IfNSQVXORQOY hl6+3v/V10AUuVT6D/U8a7UyIYuoei4ZdEolCq5tZJQNPNpMJE/P46/PHywloSQZIObI h+8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9qGswFlRD0j2khHR7PT2I53zcxF8+u37OT/9BiqIPFA=; fh=K+jvfEXLHI1+aHeREoW+qFHLwqI2jh7KnZNeFexCTwE=; b=Ol8bsgBbXMNCh/XCEKyeAEu8m14is/kmYnsdkjS2GQJyrcF8zcITX0LlxR4UCwYyDR fdN+Aaf/vIK0n0qZfccqlU8kVDZLW4WndXxOJWF+0Y0Z6/dfj9iCdHhacm3EZ8tQNFVc tZ7LNvy2DkA9iDFxNvFTtwaNGLMqUIwkkiXciG64yIHL8diW0qm9rjDIfXDNerJBDFnD +O71mqaCSHalyu0xi7NkjYV/Q8C3vOd8nMG6lJtOkGqUB/gXEHl+Iruv7xFVuLRoCLMA Ge7Urs9pSirnGa/+JT/Zb+H7RRQgPfY3YleZStW720Uy++jryFODCL3T9nWAtFAV5swr zHRQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=elg0vGch; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4751db5ce5csi60201471cf.626.2025.03.08.15.13.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Mar 2025 15:13:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=elg0vGch; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr3K4-0008Kv-O7; Sat, 08 Mar 2025 18:11:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr3Jx-0007sR-Bj for qemu-devel@nongnu.org; Sat, 08 Mar 2025 18:11:07 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr3Jt-0001ZR-BM for qemu-devel@nongnu.org; Sat, 08 Mar 2025 18:11:04 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-38dcac27bcbso2699897f8f.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=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9qGswFlRD0j2khHR7PT2I53zcxF8+u37OT/9BiqIPFA=; b=elg0vGchgLLQ7pA4AfKg0hKX/pf0BeDh98tz/qCQuDKedco3BINOXles5XfB9aujUt XIljB5IzLN6Oo/p9EtJhfmAuKGZfJSGm/y+aGyArMHnRZGsAhS4WH/39Zd28ciLX07JB poRhxsXxFsBpvO/rGEin3OuzYEBpsnQhRV8RqGCahCv8Vecicfex6oIIadhJUIXBh4UW DqosrpeK51QSff4ladJMbIzDw+aWDwsCwJiJSFf3nOK6zSbbhuj0vmh4MuOctboZguva YmwHrYAlQanGmoMJme5jcrhzF8lgfKltwuzxyR8LIiRGjzlpBMHsmoa+uefRDSS4zQu8 7eXg== 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=Fus8a9tCqBPV05b9+ZL3vYv4afEO1am7KdClpMbph0/xdDtwIdyyy7O5A3IKYbRr7u FCMEF9m+ZkUu3/+mcFVwfgYhJdCw33T7kA6mfpPI3WRgKM12nhKyUSl77YqOKAvrWo9D CX1AKpsMy4q/Xtce1i5tCbEpawIGh7l7CZRmvOr0o7geEqHcKJugBg95MYTUYSZj0G5h XQ+WIYRah3Gmhus/PxHkBxneQAdX3RrAEvFRg1shYRH7Uo0mecwGjFH/dajAg/2/nqhe LiFjdS7EJ1C9sGR3H9dXqLkV5JI9fCb5jAOBfdHQQf2ErkvdECH7us7rVQvseQ2bdy8M IQiw== X-Gm-Message-State: AOJu0YxTVdNlqdNb+IZY4TT4kJyVGTJVVey86Gg5VrG7GpKXY6YdkOkG vECo/lb6BZaxiFwZSdDkW7VZ57izN2NPoSk40VCGONHwyd7TGhTguKD8BekW5BZLteOx0BMakEH vYVc= X-Gm-Gg: ASbGncuMEhbFyr/XGAMrrXbsuLYZpOkXiTTmX0P2z6Vf+EIKkakui7Njy0UhS6nOvoS 60bSJYMhAGg0mhcP9Oa+FQmt3+fsfHAWb26scy0tMN7k7JIAlWWQ2542IaT7WAp+bRFVGD0thlU MvkSHy6WREM94HbxMc+C8JHMGODmW9y26rxkcj46XVSwnwPbxX7XCK/0K02+hT2nz/Tz+ezguXr jqhQqufld6axbTrnoFUvDUb87iybYnbh4lXa094dqSoXHk+P9fZAJHfeJXYc6vIcWShxmp9guLJ q6iD+P20hmNA3Y6X4e/AMuL7CT4M8mtt5Hun4DxTVFICMnGII470I6BlOrnuJt1w3BD4qDpzV8T dzI2Ej4TIC6ySsrkh0tc= 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> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 = {