From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355543; cv=none; d=zohomail.com; s=zohoarc; b=doe7caP0IvfrfHyWz+8U7c5ujyyp/UBLsebB2b3IAA2qLOl75U0pKU9R13euhcOpLeVAc6dDEZsVRvKZ2YVOLOJRpiKz1ztgagk2KVdE7MAwDp4T2RN7GJ4wTIx+2/GdDVds8ud25qBE/jirEvcq+SRDaoCdnew7F7BQDJ5Jats= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355543; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WVPh6hUNYTqIlaASmhU37TsP54+Ua3pMDBatmpC/UoY=; b=K+s7PawEzcSL+F+d9NBOEGYngCSZWUrJJa2ySJ5o0Q3ZwRci2rbP6Ek6ljKdPfI5dlmRVL5MiqkanhkFudJERTKc7pzhJeOZk7vOfypfPZCiqbd7hwOOQqQjusO1Pz8+Yps+kQrX7Ec2kvKNQn/U8t/nsbIE6m04cHMqSp73z2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355542911908.3976533260587; Thu, 12 Mar 2026 15:45:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omB-000718-Kf; Thu, 12 Mar 2026 18:45:07 -0400 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 1w0omA-0006zL-0h for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:06 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0om7-00031O-Du for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:05 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2aaed195901so7969215ad.0 for ; Thu, 12 Mar 2026 15:45:03 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355502; x=1773960302; 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=WVPh6hUNYTqIlaASmhU37TsP54+Ua3pMDBatmpC/UoY=; b=D8c48nl2/fN/Oo0hkXlQW4T0wEFV22yF3v96wH/x5JQa5GdzdSIXtcjKyeRh0855eU E0Owxn/zGRicq4rfCI5H0Rwjal7G9/p+y6EqPtgTc4lhdtE/ka8cK9ceFTkw6UKWVFXb GkfJUKLMnrBLhA1YDyqH8gY4WCiNzrou1dlWbXKM1UkldwDWeqKZXQN4yG0wyv7Wy0KN iURTyioijFsK7GGrq23U3a+xq6De/30IrvkVCTJnt5cVGUd9HT6wVW0Bd+X7CgXN2W/l J2Awl7YDQZjjWIFHAmc7VCULu18P4oXA90F7dAKkiw8y1JioFJcP2B5baIOmkWOlW2sn R/Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355502; x=1773960302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WVPh6hUNYTqIlaASmhU37TsP54+Ua3pMDBatmpC/UoY=; b=JCNs/gSB4MLsEzW4+BcoLFvwTGrNwNA/wNPqj/oxasHHOcuEh31VRhc871KWXKyZcY JIIGg+DFjVUMRVM63+BinSIp/AKT30hf4dZARYIdQAyfElfJ8OM0WTUEvYEo+AqZuR5V TBgUZDNy4ZUMrKRQsOFlZo4snrMb4FJ3Ub7HBS5sQa0XZjeoO/h3NfpNb/ztAEMvOCmj gNkzt7MkAStWmpK7UlS3M2FkINNXV85xIucyokeYTxxms73n/0g9nLBt1i+uiy7OxkGV EhqxO45KevgQkXbE9nUR6GBh7GHuHrEwyZwbwg74ShrTxowkL+5+Y2rfjKIbvDhE96ON 7z5A== X-Gm-Message-State: AOJu0YyD59k4DVMhEMgGbyo+mEx5pc3bswd4C/cfzumQsAZjrgN9UOIC m9VRk+Kcf0Dfm5Vt7n3Ft6prs/qkoqLONjBiGQ2LHSoqxgO/qhU20fSOUE2XL3V+d7U8POeBqkz KmUgDX0w= X-Gm-Gg: ATEYQzzdpb9RmA7Bjz0x/YsPdqyuMMlNugSjS9GsMKQmKNNhJAnYWy3r2Qa5xlmDh2R EqiAJp6fhaJZsEz+TVkfzNB7+KOJVubXWOBXP2wWO1uz7yp6xZ6D2OEz7inIhQbDTOtuxr8+rhI DxAALFLNS8/yjlQJiLDS+aUcT4Y/0Yt1rTEgNUkK+1bYU8KJAyn+wHT81NgmcKg7yy495GOxVtN G6IX+wfeCH4r+UpZEWfzFX58W+Lfju+1kERtcHV+MRToUl/8FGg0+1x4lT3hQs3+iwzA0RaJbhS awiiAsCwGbA4GXxpfkMiMgEpTG7raus7erxYjzoxsWYVF5OPxps8wJrrvQc8PRhJzk88JixOtuC QllMUxjEEQXByb19myN/pG6O9MuecY873wK6F+7z3ZoYFplAHuDf+CrqVxRkxmMjU+2UD/+GOOF C/8U9X1gl9RpY69O0NXluLjjclNRZmhwFD87R8SiTYmSd67kHqE6xapwA+RYb3j1vSDA1Np3Yal +/8GOCO/htUbhI= X-Received: by 2002:a17:903:1207:b0:2ae:48a0:33e3 with SMTP id d9443c01a7336-2aecab1b69dmr8994455ad.45.1773355501952; Thu, 12 Mar 2026 15:45:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 1/8] hw/vfio/listener.c: remove CONFIG_KVM Date: Thu, 12 Mar 2026 15:44:42 -0700 Message-ID: <20260312224449.1605071-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355543747158500 Content-Type: text/plain; charset="utf-8" Code concerned is under a kvm_enabled() guard. Signed-off-by: Pierrick Bouvier Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/listener.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 960da9e0a93..31c3113f8fb 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -20,9 +20,7 @@ =20 #include "qemu/osdep.h" #include -#ifdef CONFIG_KVM #include -#endif #include =20 #include "exec/target_page.h" @@ -303,11 +301,9 @@ static bool vfio_ram_discard_register_listener(VFIOCon= tainer *bcontainer, if (bcontainer->dma_max_mappings) { unsigned int vrdl_count =3D 0, vrdl_mappings =3D 0, max_memslots = =3D 512; =20 -#ifdef CONFIG_KVM if (kvm_enabled()) { max_memslots =3D kvm_get_max_memslots(); } -#endif =20 QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) { hwaddr start, end; --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355597; cv=none; d=zohomail.com; s=zohoarc; b=d+r7X29m5OvrvxeccMlHZfrcSgx7uUuVqWZKTgQRxotHVbCM/rITBivmf+VGkENA0rsp2Fz2VJtz2j0ARGqVbsA0xygztpX6RCU9F6yIA5zLeEOv/EFXEzeu8chQU3AT2cOZUwx7YlN3X9zlCCu0x9ylGNd9OZwzhLOo/k3EY78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355597; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=134V80R59c6cEmAV414g3btic+2TYlFOl0tJTgaOB2I=; b=U1wWr2GlBOVW29SYJSMs5I/U48oLBRofVIN8Br8RCSVoascwtsKho6IsV/hI+PMqun6mZ810w0/6CNiR81VcRyHUSSYWYQOzanB4bcRK41GP+aZae6c36PMtAxydmRN6E3zmvy53JfrkpSb7rbUIc6rgrghzluKJQ0Y8QeTOEE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355597648939.453872390247; Thu, 12 Mar 2026 15:46:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omD-000724-8M; Thu, 12 Mar 2026 18:45:09 -0400 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 1w0omA-00070C-S2 for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:06 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0om8-000399-HP for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:06 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2aae4816912so10796515ad.2 for ; Thu, 12 Mar 2026 15:45:04 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355503; x=1773960303; 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=134V80R59c6cEmAV414g3btic+2TYlFOl0tJTgaOB2I=; b=mg/HYxKh8pquVydZHkKnxz1hh8VTyf3z1Eqc0tjClSeOXd1FRDIFHuZK16j7BoJ5f2 VGuhTboW9446Rh3TVMf6wM5M66M/zobsJbWzQ5UtXRpMqvptDGWrlcxNug/eIN18sf79 oi5h1kpwLbGhtPrI/NuqH2Sd6yN+gxRrM+zczq0X7IK1UQItak6bWOEkpb/dj22d4z8h /jJLUGvgr9W0lUc33ZfJ2mAqaP6bGfLqqH0OXh6U+NyweHa8FRgacSq3OTVSxJBzxndo CRVXjizf7JnnhU1W+KyG20f8Jug00nTgUgMoYqmX13QSLWIiBhF3za1p2qN83cijMBrv GXqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355503; x=1773960303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=134V80R59c6cEmAV414g3btic+2TYlFOl0tJTgaOB2I=; b=b+kJ4jF1mHtXauKwgCq1OpkcZSS601hjxSLt7E2AXoEkrBTEiEBPi9MBmcxhqHFNrq uFV5uvNCJdu4E+Kb+iFPGgOldyKyl4yTSq/078cRChwL8aW8cnBVPmQqpQbSDk9CfCK1 AKstJboGYFpKMYUdREiOjo5e5RrCFWmsxtPemrYAUo+Cn6NCt+8cpDCJfgpXPysZROih rHY2GSzP/l9Y0piZJCGU9yY9PA/BxQxkTH0+hrhI4VaTD0LJ/uGS1g9KFPn6k6/jEWo9 vAg4pSzAWB75ZGlClD+0uay6Aa/BblnEPCXejP78IN+7xB5686uLKQ6WtDA3FTpPv43U eqIA== X-Gm-Message-State: AOJu0Yy4Io2pRGzVSKOQbH2TnZQ4QvDHEv2DJf8khtyGaYKAYUF8mD6I qXm2aByYkc1vcDpzQNldQwq6QJ14it5NSnK74sehCS7qndKqikJgOgI+/8adzwzFx8wpyFOgTAE s9VFBTWU= X-Gm-Gg: ATEYQzxHDEn0Walb3fp+6/wtXZb2H63+6WxnKqdH0nPnmKD7+8ELHZUdWh4ljWVkPZZ nOKGGg+uFS4QgfydqEY/2mftoKkrN7k+r2tHRpNX5wUH5Eh6RCzdmCG2mlAgcaJSj+/fy9MW09D oUJrA6mWK+NVRyZwNN7ltl2SYG+ofNpPiDJrC2vH04PLQQiotKtMxQz4NlmSE2FYz0AkgmN/5KO oqpBD1AXY+pXENTTlxjz4tE7Vnarw3JXWrXxGsccwZYz4ZJTzCpdIQbR2/2zk//itvWboXfhijC HxfM8zAzWv1Wbp6WU4lic7NCf8QCYigFjew9a0uFw4U+8B+g+nCxbTE/5gM7EdeXMMwnYrUjduO Z9T3B5mr6mly3CBPE8VVveq+thxf9zwlPUzkK1BE+Hv4H6CrbCaGc0GqeTqZaze1+ivmcUE6DUY bz/zum+ZIIlwaqoltzI7BD+1susT0mV8oCOjlCH+R07PO/Bv3zbOi7Q5qG9ZDXslIeVgH/YkclE kPOwaLCwXfkbL0= X-Received: by 2002:a17:902:d54b:b0:2ae:5671:7067 with SMTP id d9443c01a7336-2aecaa7f8admr9750145ad.23.1773355502781; Thu, 12 Mar 2026 15:45:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 2/8] hw/vfio/helpers.c: extract kvm helpers in kvm-helpers.c Date: Thu, 12 Mar 2026 15:44:43 -0700 Message-ID: <20260312224449.1605071-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355598044158500 Content-Type: text/plain; charset="utf-8" Because those functions use kvm specific types, they need to be isolated in another source file. This allows us to link kvm-helpers only in configurations with CONFIG_KVM. Signed-off-by: Pierrick Bouvier Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/helpers.c | 172 ------------------------------------- hw/vfio/kvm-helpers.c | 192 ++++++++++++++++++++++++++++++++++++++++++ hw/vfio/kvm-stubs.c | 27 ++++++ hw/vfio/meson.build | 2 + 4 files changed, 221 insertions(+), 172 deletions(-) create mode 100644 hw/vfio/kvm-helpers.c create mode 100644 hw/vfio/kvm-stubs.c diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index 00d42d3b98e..65c6dba0428 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -22,7 +22,6 @@ #include "qemu/osdep.h" #include =20 -#include "system/kvm.h" #include "exec/cpu-common.h" #include "hw/vfio/vfio-device.h" #include "hw/core/hw-error.h" @@ -107,177 +106,6 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_= info *info, return true; } =20 -#ifdef CONFIG_KVM -/* - * We have a single VFIO pseudo device per KVM VM. Once created it lives - * for the life of the VM. Closing the file descriptor only drops our - * reference to it and the device's reference to kvm. Therefore once - * initialized, this file descriptor is only released on QEMU exit and - * we'll re-use it should another vfio device be attached before then. - */ -int vfio_kvm_device_fd =3D -1; - -/* - * Confidential virtual machines: - * During reset of confidential vms, the kvm vm file descriptor changes. - * In this case, the old vfio kvm file descriptor is - * closed and a new descriptor is created against the new kvm vm file - * descriptor. - */ - -typedef struct VFIODeviceFd { - int fd; - QLIST_ENTRY(VFIODeviceFd) node; -} VFIODeviceFd; - -static QLIST_HEAD(, VFIODeviceFd) vfio_device_fds =3D - QLIST_HEAD_INITIALIZER(vfio_device_fds); - -static void vfio_device_fd_list_add(int fd) -{ - VFIODeviceFd *file_fd; - file_fd =3D g_malloc0(sizeof(*file_fd)); - file_fd->fd =3D fd; - QLIST_INSERT_HEAD(&vfio_device_fds, file_fd, node); -} - -static void vfio_device_fd_list_remove(int fd) -{ - VFIODeviceFd *file_fd, *next; - - QLIST_FOREACH_SAFE(file_fd, &vfio_device_fds, node, next) { - if (file_fd->fd =3D=3D fd) { - QLIST_REMOVE(file_fd, node); - g_free(file_fd); - break; - } - } -} - -static int vfio_device_fd_rebind(NotifierWithReturn *notifier, void *data, - Error **errp) -{ - VFIODeviceFd *file_fd; - struct kvm_device_attr attr =3D { - .group =3D KVM_DEV_VFIO_FILE, - .attr =3D KVM_DEV_VFIO_FILE_ADD, - }; - struct kvm_create_device cd =3D { - .type =3D KVM_DEV_TYPE_VFIO, - }; - - /* we are not interested in pre vmfd change notification */ - if (((VmfdChangeNotifier *)data)->pre) { - return 0; - } - - if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) { - error_setg_errno(errp, errno, "Failed to create KVM VFIO device"); - return -errno; - } - - if (vfio_kvm_device_fd !=3D -1) { - close(vfio_kvm_device_fd); - } - - vfio_kvm_device_fd =3D cd.fd; - - QLIST_FOREACH(file_fd, &vfio_device_fds, node) { - attr.addr =3D (uint64_t)(unsigned long)&file_fd->fd; - if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { - error_setg_errno(errp, errno, - "Failed to add fd %d to KVM VFIO device", - file_fd->fd); - return -errno; - } - } - return 0; -} - -static struct NotifierWithReturn vfio_vmfd_change_notifier =3D { - .notify =3D vfio_device_fd_rebind, -}; - -#endif - -void vfio_kvm_device_close(void) -{ -#ifdef CONFIG_KVM - kvm_close(); - if (vfio_kvm_device_fd !=3D -1) { - close(vfio_kvm_device_fd); - vfio_kvm_device_fd =3D -1; - } -#endif -} - -int vfio_kvm_device_add_fd(int fd, Error **errp) -{ -#ifdef CONFIG_KVM - struct kvm_device_attr attr =3D { - .group =3D KVM_DEV_VFIO_FILE, - .attr =3D KVM_DEV_VFIO_FILE_ADD, - .addr =3D (uint64_t)(unsigned long)&fd, - }; - - if (!kvm_enabled()) { - return 0; - } - - if (vfio_kvm_device_fd < 0) { - struct kvm_create_device cd =3D { - .type =3D KVM_DEV_TYPE_VFIO, - }; - - if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) { - error_setg_errno(errp, errno, "Failed to create KVM VFIO devic= e"); - return -errno; - } - - vfio_kvm_device_fd =3D cd.fd; - /* - * If the vm file descriptor changes, add a notifier so that we can - * re-create the vfio_kvm_device_fd. - */ - kvm_vmfd_add_change_notifier(&vfio_vmfd_change_notifier); - } - - if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { - error_setg_errno(errp, errno, "Failed to add fd %d to KVM VFIO dev= ice", - fd); - return -errno; - } - - vfio_device_fd_list_add(fd); -#endif - return 0; -} - -int vfio_kvm_device_del_fd(int fd, Error **errp) -{ -#ifdef CONFIG_KVM - struct kvm_device_attr attr =3D { - .group =3D KVM_DEV_VFIO_FILE, - .attr =3D KVM_DEV_VFIO_FILE_DEL, - .addr =3D (uint64_t)(unsigned long)&fd, - }; - - if (vfio_kvm_device_fd < 0) { - error_setg(errp, "KVM VFIO device isn't created yet"); - return -EINVAL; - } - - if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { - error_setg_errno(errp, errno, - "Failed to remove fd %d from KVM VFIO device", fd= ); - return -errno; - } - - vfio_device_fd_list_remove(fd); -#endif - return 0; -} - struct vfio_device_info *vfio_get_device_info(int fd) { struct vfio_device_info *info; diff --git a/hw/vfio/kvm-helpers.c b/hw/vfio/kvm-helpers.c new file mode 100644 index 00000000000..d71c9590aaa --- /dev/null +++ b/hw/vfio/kvm-helpers.c @@ -0,0 +1,192 @@ +/* + * low level and IOMMU backend agnostic helpers used by VFIO devices, + * related to regions, interrupts, capabilities + * + * Copyright Red Hat, Inc. 2012 + * + * Authors: + * Alex Williamson + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Based on qemu-kvm device-assignment: + * Adapted for KVM by Qumranet. + * Copyright (c) 2007, Neocleus, Alex Novik (alex@neocleus.com) + * Copyright (c) 2007, Neocleus, Guy Zana (guy@neocleus.com) + * Copyright (C) 2008, Qumranet, Amit Shah (amit.shah@qumranet.com) + * Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com) + * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com) + */ + +#include "qemu/osdep.h" +#include + +#include +#include "system/kvm.h" +#include "exec/cpu-common.h" +#include "hw/vfio/vfio-device.h" +#include "hw/core/hw-error.h" +#include "qapi/error.h" +#include "vfio-helpers.h" + +/* + * We have a single VFIO pseudo device per KVM VM. Once created it lives + * for the life of the VM. Closing the file descriptor only drops our + * reference to it and the device's reference to kvm. Therefore once + * initialized, this file descriptor is only released on QEMU exit and + * we'll re-use it should another vfio device be attached before then. + */ +int vfio_kvm_device_fd =3D -1; + +/* + * Confidential virtual machines: + * During reset of confidential vms, the kvm vm file descriptor changes. + * In this case, the old vfio kvm file descriptor is + * closed and a new descriptor is created against the new kvm vm file + * descriptor. + */ + +typedef struct VFIODeviceFd { + int fd; + QLIST_ENTRY(VFIODeviceFd) node; +} VFIODeviceFd; + +static QLIST_HEAD(, VFIODeviceFd) vfio_device_fds =3D + QLIST_HEAD_INITIALIZER(vfio_device_fds); + +static void vfio_device_fd_list_add(int fd) +{ + VFIODeviceFd *file_fd; + file_fd =3D g_malloc0(sizeof(*file_fd)); + file_fd->fd =3D fd; + QLIST_INSERT_HEAD(&vfio_device_fds, file_fd, node); +} + +static void vfio_device_fd_list_remove(int fd) +{ + VFIODeviceFd *file_fd, *next; + + QLIST_FOREACH_SAFE(file_fd, &vfio_device_fds, node, next) { + if (file_fd->fd =3D=3D fd) { + QLIST_REMOVE(file_fd, node); + g_free(file_fd); + break; + } + } +} + +static int vfio_device_fd_rebind(NotifierWithReturn *notifier, void *data, + Error **errp) +{ + VFIODeviceFd *file_fd; + struct kvm_device_attr attr =3D { + .group =3D KVM_DEV_VFIO_FILE, + .attr =3D KVM_DEV_VFIO_FILE_ADD, + }; + struct kvm_create_device cd =3D { + .type =3D KVM_DEV_TYPE_VFIO, + }; + + /* we are not interested in pre vmfd change notification */ + if (((VmfdChangeNotifier *)data)->pre) { + return 0; + } + + if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) { + error_setg_errno(errp, errno, "Failed to create KVM VFIO device"); + return -errno; + } + + if (vfio_kvm_device_fd !=3D -1) { + close(vfio_kvm_device_fd); + } + + vfio_kvm_device_fd =3D cd.fd; + + QLIST_FOREACH(file_fd, &vfio_device_fds, node) { + attr.addr =3D (uint64_t)(unsigned long)&file_fd->fd; + if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { + error_setg_errno(errp, errno, + "Failed to add fd %d to KVM VFIO device", + file_fd->fd); + return -errno; + } + } + return 0; +} + +static struct NotifierWithReturn vfio_vmfd_change_notifier =3D { + .notify =3D vfio_device_fd_rebind, +}; + +void vfio_kvm_device_close(void) +{ + kvm_close(); + if (vfio_kvm_device_fd !=3D -1) { + close(vfio_kvm_device_fd); + vfio_kvm_device_fd =3D -1; + } +} + +int vfio_kvm_device_add_fd(int fd, Error **errp) +{ + struct kvm_device_attr attr =3D { + .group =3D KVM_DEV_VFIO_FILE, + .attr =3D KVM_DEV_VFIO_FILE_ADD, + .addr =3D (uint64_t)(unsigned long)&fd, + }; + + if (!kvm_enabled()) { + return 0; + } + + if (vfio_kvm_device_fd < 0) { + struct kvm_create_device cd =3D { + .type =3D KVM_DEV_TYPE_VFIO, + }; + + if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) { + error_setg_errno(errp, errno, "Failed to create KVM VFIO devic= e"); + return -errno; + } + + vfio_kvm_device_fd =3D cd.fd; + /* + * If the vm file descriptor changes, add a notifier so that we can + * re-create the vfio_kvm_device_fd. + */ + kvm_vmfd_add_change_notifier(&vfio_vmfd_change_notifier); + } + + if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { + error_setg_errno(errp, errno, "Failed to add fd %d to KVM VFIO dev= ice", + fd); + return -errno; + } + + vfio_device_fd_list_add(fd); + return 0; +} + +int vfio_kvm_device_del_fd(int fd, Error **errp) +{ + struct kvm_device_attr attr =3D { + .group =3D KVM_DEV_VFIO_FILE, + .attr =3D KVM_DEV_VFIO_FILE_DEL, + .addr =3D (uint64_t)(unsigned long)&fd, + }; + + if (vfio_kvm_device_fd < 0) { + error_setg(errp, "KVM VFIO device isn't created yet"); + return -EINVAL; + } + + if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { + error_setg_errno(errp, errno, + "Failed to remove fd %d from KVM VFIO device", fd= ); + return -errno; + } + + vfio_device_fd_list_remove(fd); + return 0; +} diff --git a/hw/vfio/kvm-stubs.c b/hw/vfio/kvm-stubs.c new file mode 100644 index 00000000000..9593287d9c2 --- /dev/null +++ b/hw/vfio/kvm-stubs.c @@ -0,0 +1,27 @@ +/* + * Stubs for kvm helpers + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include + +#include "hw/vfio/vfio-device.h" +#include "qapi/error.h" +#include "vfio-helpers.h" + +void vfio_kvm_device_close(void) +{ + return; +} + +int vfio_kvm_device_add_fd(int fd, Error **errp) +{ + return 0; +} + +int vfio_kvm_device_del_fd(int fd, Error **errp) +{ + return 0; +} diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 82f68698fb8..f32d8573600 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -7,6 +7,8 @@ vfio_ss.add(files( 'container-legacy.c', 'helpers.c', )) +vfio_ss.add(when: 'CONFIG_KVM', if_true: files('kvm-helpers.c'), + if_false: files('kvm-stubs.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', --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355601; cv=none; d=zohomail.com; s=zohoarc; b=i6DWq6950IiGKuo1K/8P80k7eC2e86uVLgNb8Rwx1kKuz2E3PxRuDuJqrWXect5cxre3aPHxxetd8wggotuE9SsFASUPDPHGyPgRLt4s51ButsNoF6EqquR+7rvIVs/LdqDo4kRC9DhlUHPSKvZvYuVNyYY2H6wqnQM7iW8FWYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355601; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TZOplH2+O/7OD+MRzOhHvfoC8xpMBAXb6gpsEWwHNLc=; b=YU+/IuLKpZesE5E0mPMSll94e+DXe87fyJ2AbFUkLC6KreiiMRvxJJoq88ys1er+XJdLmxzaLKbjYYK2LFZMyvmQT7QvJInmss1Ghqe/z1MI3N7CdzgXS5RFw9LIf/x9/mhREJPp5ECDhmfFq9TczhvaQAYqenfXtARbWHZd9hw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355601948877.1611001736582; Thu, 12 Mar 2026 15:46:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omD-000723-6z; Thu, 12 Mar 2026 18:45:09 -0400 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 1w0omB-00070i-CG for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:07 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0om9-0003Bt-2T for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:07 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2ae3a2f6007so11081905ad.2 for ; Thu, 12 Mar 2026 15:45:04 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355503; x=1773960303; 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=TZOplH2+O/7OD+MRzOhHvfoC8xpMBAXb6gpsEWwHNLc=; b=mBGwFLRf7Aw8N7XcCRhuNyjEFnp8D+qtiDexaQGR8qveGtHx5IlzZAjLgWhw+i6qYS qoduwFUP7r9m8FZ9go+Otf8G+kiRBgJH09LrCjE1Ud4v6q/1S4uWRgL0q98h8yi7HNwW 2BM/yOM3ush2QXQ9B0LHuOmt2lST0uBI37NkuW24XoZTWAGpByk4fTJMAeRqdfGoQOZu Q+DIDreDixu2DFnQ2dmGFJnjs5iyAewZ2xg2asqEBa4/ie5XeAt5Jzky3aTQ2Syu6Sdm 8rJL3IyOEJ0H7qiosqB3gfFE/r49OLr2I1DCMt+huHDhOo412cek3lwrZwSQv3JE1iHa Mhcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355503; x=1773960303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TZOplH2+O/7OD+MRzOhHvfoC8xpMBAXb6gpsEWwHNLc=; b=GQonf2RfvyB+IIWtlgbYqHu4poekStEC6WLS/BN/5VquHoRQqgrifKkpuJY0+czxL7 L1+5f/vu35pEKxbZFuNC4X4+eM9Gn8iKm33ScX+ZdX5L2+9Yh5+1YyiOhWKCFieArIqs fOUXZjEvT80O4gUTbHSA2X4Yzt+ASBxFxo9qH0aS87WMNhTCYgcRP7tSIi/WbgE5tczk Z2LogKL/8KBOqa6f/hfnZTdGehuc9EXH/obriJmNCPEgkmQbUWHJeCIPtMvpBnexwD91 vGLwjWHeQoAfx0qNP27I7Lz9S6cRg9Wqu3Qh4jrGvYG3bf2hhJi4jpt8mJjzfloE3H5o vvvw== X-Gm-Message-State: AOJu0YxoV2LLluqkwtF8X8wygBfoRwDCZc8Nx/1G1bBf1pka4yBV2LGp FcJN4YNCnlhYZAQkk6OsAfuiDFhkQdhkyJE07AwW/7YxxD/OmhxQXDp/JNngdmBKzZPOVMdoX06 Qarwtbnc= X-Gm-Gg: ATEYQzzlAGeXrapdmscdK4GkFNdy2MgpDiRVHckCdPlM8qSO0Ix8VhCxmn7aisufZh0 AKIgEzRBLf6Gxg4Sw60dvvwqZRTfFjE9sQkd6wNTYMHVWnm8HHPatpIhnwhJKOt0AQDwoaI650+ 2KMd+lPe+QM8n4Irt7QOM0bUuqz7UsxZHOXypbRQmWjsGOAl0K8YbHVCYiCxpe/9m5LSs8vvjpp BEmkvYEwlZhgeuYVBQUVum24fllVcBfBKiM4TPCcaZVdWSUQCqpJaQpteN7Fmw2LAvejK95X/Er 0EW6x7MQ1l0LatZz4BNCUZ8c6oavgBx3W6W+5A7QaYH8hW0a3FIPvJmv68WzCEyrU5v5zmTvW4h BXf8ngl2mnJYmwttQI+zo5mQHeA0pBhKgmptmN1CTn9Gv1QR14A71RwRhOGj0EPxE4DTwtYLfwz dSSDLDFPAwpqIiAb6S58aYa0v8dqCWzRIxcpYQn21z2TzfBlpoPfRSzlM7/2Gc2gbmj0NmONNCR u4Y X-Received: by 2002:a17:902:fc87:b0:2ae:5a55:3ded with SMTP id d9443c01a7336-2aecac79ec4mr9026985ad.45.1773355503530; Thu, 12 Mar 2026 15:45:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 3/8] hw/vfio/pci-quirks.c: remove CONFIG_VFIO_IGD Date: Thu, 12 Mar 2026 15:44:44 -0700 Message-ID: <20260312224449.1605071-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355603921158500 Content-Type: text/plain; charset="utf-8" Add stubs for needed functions. Signed-off-by: Pierrick Bouvier Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/igd-stubs.c | 20 ++++++++++++++++++++ hw/vfio/pci-quirks.c | 5 ----- hw/vfio/meson.build | 3 ++- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 hw/vfio/igd-stubs.c diff --git a/hw/vfio/igd-stubs.c b/hw/vfio/igd-stubs.c new file mode 100644 index 00000000000..f7687d90912 --- /dev/null +++ b/hw/vfio/igd-stubs.c @@ -0,0 +1,20 @@ +/* + * IGD device quirks stubs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/qmp/qerror.h" +#include "pci.h" +#include "pci-quirks.h" + +void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr) +{ + return; +} + +bool vfio_probe_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp) +{ + return true; +} diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 7b907b9360d..ab864048943 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -11,7 +11,6 @@ */ =20 #include "qemu/osdep.h" -#include CONFIG_DEVICES #include "exec/memop.h" #include "qemu/units.h" #include "qemu/log.h" @@ -1128,11 +1127,9 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDev= ice *vdev, int nr) */ bool vfio_config_quirk_setup(VFIOPCIDevice *vdev, Error **errp) { -#ifdef CONFIG_VFIO_IGD if (!vfio_probe_igd_config_quirk(vdev, errp)) { return false; } -#endif return true; } =20 @@ -1179,9 +1176,7 @@ 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); -#endif } =20 void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index f32d8573600..562ba79d1c0 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -16,7 +16,8 @@ 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_AP', if_true: files('ap.c')) -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) +vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c'), + if_false: files('igd-stubs.c')) =20 specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) =20 --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355577; cv=none; d=zohomail.com; s=zohoarc; b=KzPqbAfvm4xL2RpdWHUkj0BgnrjsCctkwNqnrOmQzh7OMEqJiceUytMIWcHiAyUSHw99zO6cpUjbg06zKX+8wn49VsuEF7YxxZY3hkq2xTeOzYg+cAiBIPUHBjkwD50hK19LBSJOGPD8w8m+MEgLo9OrPpSJkkFaayUZIpbza/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355577; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=N4ZUK5OdFX1Uj62uUQzKpHzS+GcZQqU09JoP5tVMW5I=; b=P9HMVyGA+rl6Diospz0rKICEIczzoPFW6aFOGEFAEskqsOAwu3ZsAnmUzMs82o6FX0Ri/CuBRv5xk48cdHKD//Ny/D+5gK24ccvDvaOBNuArrdP7RmUvX6Zq8qT5V200U/wlJMMYXWL3X096dG8Q+bb/muIzxzWmP67mtYubnLA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355577298644.4252589243237; Thu, 12 Mar 2026 15:46:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omN-00076h-In; Thu, 12 Mar 2026 18:45:20 -0400 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 1w0omC-000721-Oh for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:09 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0om9-0003EY-Tt for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:08 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-35691a231a7so905715a91.3 for ; Thu, 12 Mar 2026 15:45:05 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355504; x=1773960304; 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=N4ZUK5OdFX1Uj62uUQzKpHzS+GcZQqU09JoP5tVMW5I=; b=D21tqW/cJdbo/fR3RpkS+a3fQCmdBprFii0FPMaU+yGJnY13Ar8/3WoET6NH5fh1Di OvNZYcNIvg9Oz6jZcldlA8fprGTE32G+6mNAzvDBwpyQmcv9sMBxdWagjeZkFo50jmSk X3nuWX/pRi0a1pCfT/X7IRKSs0A5zZlKFVFMdVTw1DkhB6tIVztmrGIWP/X4nidi+mI7 6DuRamcl9+pV1EpP0k2xZV27wWdOruZFs7n0SgAedH5rrSkcdxN2rN06mxi5LuqdzU1I hz6AHQ6JJhS9MzF5tB4J6LcQ02IM2XT8afZVbYUBTNKphLHrkVlbTGin0rEzJglbpKAL D/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355504; x=1773960304; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=N4ZUK5OdFX1Uj62uUQzKpHzS+GcZQqU09JoP5tVMW5I=; b=cuh2JFsHkyJWLFKOUmmO1R78+bpz3sAvjuN+PtZhG8h9Mmo7c/a63DXe4yAmRz9KQr tIJDkH51jRUZW23yQL5iePbkkdXzzpHSTdb7ARsWK2KEZKOmhWWISgrjYSRDUO5e3W4I LMNBUp/vlClOZojF/vXbgAjlws96IVKbvmzin4PRsKd9obS31b2gkxYNx8wxAQQarHOf G8Kbn+eBL/cB1Wi6TvWwuM2NnbHEajcFizMLgohGLXvF0PfpJuyh8qeCZXxYoBf8sWzH syxP5SJQQpQRjTkdC4ykpFfBc4eTld+AuqSTjvGfAjNWprlYinXvPDkBcQzNqSJREXRk 5ZlQ== X-Gm-Message-State: AOJu0Yw1lwlTUulYaaXfgjX1RJcC6C+1UgWbVMkF7GR3uoQZe2KPhNE0 n3iFRF/t0qjvVCeKLsbz3nhFvhd8wwKdFEUtTydWjcHIDl3xvjpSAcFp2Taqt/vnZPiXXpgyALq qgqnAr7M= X-Gm-Gg: ATEYQzzU3KoVE7mO6QQp7taw2XfMT2WknxI+hXA98s3I0vPlgy3IagYkju0nC5sj085 evABOmQDzy8nwdrCHQbGiCcFzr4l2+yr7a0pA5yNTUXjj1H1B8yo+oEu0+ssJaEQ29buRcJJY62 KkXHHKpqyt1BiPOCekYa0fpV7EIEGIIzVWPBrsSZiGtl06NPrPHLkQAiwpHiUExziE/IuN8YxfK sTn3lGW6BeWlLQK/CpWupGj9I6GJuIYerVVZn2nWHRkjzEkP75LL2Y3OcECVIw1ZwnBW3hjuxRJ KxrksC/4hXM8zJGKzv7X3S/75hxxnc7WLWczW4l+lfaDiH53E0wSIlKkx+zUArSl1blV0tSbtd+ N757tr/CfvsDeqmwe80/GRbZkYmO20KAe8k+krxY8Z8Y172CILeV4k8p2kWJ9hKiUTLHZ3TQwpP CPx3k8mlzUAGXvLLiUZ1/J8lgtE7BsQyWrf1iNFkqrJGLixSADI/TCWTwUApBVYfhV8ltPc6wAr mVt X-Received: by 2002:a17:903:24f:b0:2ae:826f:2c50 with SMTP id d9443c01a7336-2aeca9411edmr8672495ad.12.1773355504346; Thu, 12 Mar 2026 15:45:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 4/8] hw/vfio: eradicate CONFIG_IOMMU from sources Date: Thu, 12 Mar 2026 15:44:45 -0700 Message-ID: <20260312224449.1605071-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1031.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355580341154100 Content-Type: text/plain; charset="utf-8" As pointed in c1139fa4 "vfio/iommufd: Remove CONFIG_IOMMUFD usage", iommufd presence can be detected at runtime (through /dev/iommufd) and we don't need to isolate this at build time. It's much (much) more simple to expose this inconditionally compared to build dynamically properties arrays. Signed-off-by: Pierrick Bouvier --- hw/vfio/ap.c | 9 --------- hw/vfio/ccw.c | 9 --------- hw/vfio/pci.c | 11 ----------- 3 files changed, 29 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index e58a0169af9..856fa2678cd 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -11,7 +11,6 @@ */ =20 #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include #include "qapi/error.h" @@ -279,10 +278,8 @@ static void vfio_ap_unrealize(DeviceState *dev) =20 static const Property vfio_ap_properties[] =3D { DEFINE_PROP_STRING("sysfsdev", VFIOAPDevice, vdev.sysfsdev), -#ifdef CONFIG_IOMMUFD DEFINE_PROP_LINK("iommufd", VFIOAPDevice, vdev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif }; =20 static void vfio_ap_reset(DeviceState *dev) @@ -320,21 +317,17 @@ static void vfio_ap_instance_init(Object *obj) vbasedev->mdev =3D true; } =20 -#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 =20 static void vfio_ap_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 device_class_set_props(dc, vfio_ap_properties); -#ifdef CONFIG_IOMMUFD object_class_property_add_str(klass, "fd", NULL, vfio_ap_set_fd); -#endif dc->vmsd =3D &vfio_ap_vmstate; dc->desc =3D "VFIO-based AP device assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -347,11 +340,9 @@ static void vfio_ap_class_init(ObjectClass *klass, con= st void *data) object_class_property_set_description(klass, /* 3.1 */ "sysfsdev", "Host sysfs path of assigned dev= ice"); -#ifdef CONFIG_IOMMUFD object_class_property_set_description(klass, /* 9.0 */ "iommufd", "Set host IOMMUFD backend device= "); -#endif } =20 static const TypeInfo vfio_ap_info =3D { diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 2251facb356..c66f42a13c2 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -15,7 +15,6 @@ */ =20 #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include #include @@ -647,10 +646,8 @@ static void vfio_ccw_unrealize(DeviceState *dev) static const Property vfio_ccw_properties[] =3D { DEFINE_PROP_STRING("sysfsdev", VFIOCCWDevice, vdev.sysfsdev), DEFINE_PROP_BOOL("force-orb-pfch", VFIOCCWDevice, force_orb_pfch, fals= e), -#ifdef CONFIG_IOMMUFD DEFINE_PROP_LINK("iommufd", VFIOCCWDevice, vdev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), -#endif DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), }; =20 @@ -679,12 +676,10 @@ static void vfio_ccw_instance_init(Object *obj) DEVICE(vcdev), true); } =20 -#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 =20 static void vfio_ccw_class_init(ObjectClass *klass, const void *data) { @@ -692,9 +687,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, con= st void *data) S390CCWDeviceClass *cdc =3D S390_CCW_DEVICE_CLASS(klass); =20 device_class_set_props(dc, vfio_ccw_properties); -#ifdef CONFIG_IOMMUFD object_class_property_add_str(klass, "fd", NULL, vfio_ccw_set_fd); -#endif dc->vmsd =3D &vfio_ccw_vmstate; dc->desc =3D "VFIO-based subchannel assignment"; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -713,11 +706,9 @@ static void vfio_ccw_class_init(ObjectClass *klass, co= nst 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 object_class_property_set_description(klass, /* 9.2 */ "loadparm", "Define which devices that can b= e used for booting"); diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 94c174a773f..df617f1fe46 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include #include =20 @@ -3471,9 +3470,7 @@ static void vfio_pci_realize(PCIDevice *pdev, Error *= *errp) ~vdev->host.slot || ~vdev->host.function)) { error_setg(errp, "No provided host device"); error_append_hint(errp, "Use -device vfio-pci,host=3DDDDD:BB:D= D.F " -#ifdef CONFIG_IOMMUFD "or -device vfio-pci,fd=3DDEVICE_FD " -#endif "or -device vfio-pci,sysfsdev=3DPATH_TO_DEVI= CE\n"); return; } @@ -3816,22 +3813,18 @@ static const Property vfio_pci_properties[] =3D { qdev_prop_nv_gpudirect_clique, uint8_t), DEFINE_PROP_OFF_AUTO_PCIBAR("x-msix-relocation", VFIOPCIDevice, msix_r= elo, 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= ), DEFINE_PROP_UINT16("x-vpasid-cap-offset", VFIOPCIDevice, vpasid_cap_offset, 0), }; =20 -#ifdef CONFIG_IOMMUFD static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp) { VFIOPCIDevice *vdev =3D VFIO_PCI_DEVICE(obj); vfio_device_set_fd(&vdev->vbasedev, str, errp); } -#endif =20 static void vfio_pci_class_init(ObjectClass *klass, const void *data) { @@ -3840,9 +3833,7 @@ static void vfio_pci_class_init(ObjectClass *klass, c= onst void *data) =20 device_class_set_legacy_reset(dc, vfio_pci_reset); device_class_set_props(dc, vfio_pci_properties); -#ifdef CONFIG_IOMMUFD object_class_property_add_str(klass, "fd", NULL, vfio_pci_set_fd); -#endif dc->vmsd =3D &vfio_cpr_pci_vmstate; dc->desc =3D "VFIO-based PCI device assignment"; pdc->realize =3D vfio_pci_realize; @@ -3944,11 +3935,9 @@ static void vfio_pci_class_init(ObjectClass *klass, = const 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 object_class_property_set_description(klass, /* 9.1 */ "x-device-dirty-page-tracking", "Disable device dirty page track= ing and use " --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355573; cv=none; d=zohomail.com; s=zohoarc; b=KXDBMZbi5E17e3DlkHLAcHvY5rfr9TbwrPHpjOF64fFk75ZU1AE4S1svOO07p4qaj2Efio4ZuDMUlve5ivLCE72p7StRT8OoPlxcllLYgk//52DY9NK95IXhV52ZEKeSFJ4OIpL392mzbw6JyQBbHRAeB4LUzmvXfNMA9dFW5HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355573; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P+J15QbmDP1KfgvN4Sy0sZRg5hAEYSJNvq7qy4iGGvU=; b=nRI2E3sW/yHDf23NUowxCf39PvNzM4Kzs+yODgfxjkXh1JdcTO82EjZMlHNCbgMzH4e6x0z/9snRs+x+4upwjmG9tuH1CRCWA5NMg2uaRrtrcS0ByGU3/NMDvf7hNCXdH21nKpnzSmrvEtVuvX5wkkGuXoIsYKtv2YHa8mbUrn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355573118684.4297647996452; Thu, 12 Mar 2026 15:46:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omE-00073d-Sv; Thu, 12 Mar 2026 18:45:10 -0400 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 1w0omC-000722-Pk for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:09 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0omA-0003Fk-LF for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:08 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-c7384f5a9cdso638864a12.0 for ; Thu, 12 Mar 2026 15:45:06 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355505; x=1773960305; 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=P+J15QbmDP1KfgvN4Sy0sZRg5hAEYSJNvq7qy4iGGvU=; b=bnPU9frdZttKIm03606NlHT1EKwxAGellDhtJm8L/eDeXyaHFzWmvi10D85fS0ajGD ikchukvUqQVOj/air5JZF8kr6+2YxK2vL5GOWfqQ6XsfWpAYJDm0Qt3Jc23BXN9BC/6x gtX+ZzpUytTfI9RzJwrv4NkXBBoymkKcUWSCv3F+XbXGpTytDDPKCi9SUZ6V2YZbskgi GWPqMW4mF46mXNiNf53XNOLa41cMZUUJkDeuGlPo9pTBuoL0+ECgwgwZb4HAqnyJXemW vjGowXXGIRvO/Q3Qgy/MWKiZCh0T7aMr6b35Ae9aIVf+eiwbhPB4NUksASBkro7Be/p4 PmVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355505; x=1773960305; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P+J15QbmDP1KfgvN4Sy0sZRg5hAEYSJNvq7qy4iGGvU=; b=c8KQ6Qku1PgzwtU2vDg887BBkpCDB4dSmvVplIoIATAASVUlC3d3GVXyUI2fedmYEC t1/X2aEVXfJaJd+eS0AqMd+vJF70vOt/X1UTA65eslEoMKW2EC0nQQ9+6l7VyrqTFaR1 Rrgf7IxNAonLoBvkZ8IPMzBkCt4Ahu0ZcBeFdX4TVspKsdVWC8EVSJhgRMAo0TNVdfV5 39wi98eRuXZa7C/RNMyQaMLSWrLt5TohjqBMlP1XATly+k6I/CPhDSnHdb10zQNjCzf8 Q/gHEqDbz7yV1jKY/noy+lu1rXCT6YINWcCys22mA4Ah4Xv4tBjIH6RP8l2KYOJn0ZpM 9Tmw== X-Gm-Message-State: AOJu0YwoD1J+PCizTkJqTawHQZ9UMxxsE5j9XW9Yv/G8XHt9XhAk3Gvh Apkdhqd1pvJn/WUjw9wLufflSAWx+srDSVquWtzIVfwBSqZEI3sozKlD1esJ/8BW6on8a2MTH6j 6A+mJgI0= X-Gm-Gg: ATEYQzyLZikoBNEkq4xIwEIv6FcRpyHDRKkl3uNURa77IpzEfndmW0JrXa5LgTGzG5d k7SkWrxb73/tIYXjM/rokATxLBNc2XP9AyNFd0hmwIZVbxuuCG7loP70LjkYbWqaFkcNDuqGZyc eN3E9BNQUH0Bycz1e6Aoakt+nrqhDcGQiAvve/34kORlf1EnI4KielVw+Vuu+dzdlp32/kfIZVk jMLljT3aTGSOy4ZBUPSiNC8B4zXXrHj/yljMMXf01lbAE6iofX5rtvuge1BJfkoihUz3xQXH6oy LRGQXxmZtu0n5smZunCRfVg5JRiRDYUrV+dULp2C8gzwgW5nDTpktiVd6wZs4xWD/vHl9+V79HF 5SxySxQU0dRr6EoUzM0ezconIEXke4FHp2WI+FMUPlwJOejIvhQTovpx5oN8T5eV3aKFEsrDFZv pR07lY4zBnV37JGVlX27tgGDkfIzEV+tafAJ7KQxMNjqP4L7tbiFiDlLMQ9RUsgjBK2f8rcl4uh GpY X-Received: by 2002:a17:903:3910:b0:2ae:cb0e:fd74 with SMTP id d9443c01a7336-2aecb0f020fmr8415865ad.24.1773355505045; Thu, 12 Mar 2026 15:45:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 5/8] hw/vfio/pci.c: eradicate CONFIG_KVM Date: Thu, 12 Mar 2026 15:44:46 -0700 Message-ID: <20260312224449.1605071-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x532.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355573853158500 Content-Type: text/plain; charset="utf-8" We just need to add kvm_enabled() guard on concerned functions, but no need to extract those kvm functions since they are not using any kvm specific types that would not be visible at compilation time. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/pci.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index df617f1fe46..62c52407cf9 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -152,7 +152,10 @@ void vfio_pci_intx_eoi(VFIODevice *vbasedev) =20 static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) { -#ifdef CONFIG_KVM + if (!kvm_enabled()) { + return true; + } + PCIDevice *pdev =3D PCI_DEVICE(vdev); int irq_fd =3D event_notifier_get_fd(&vdev->intx.interrupt); =20 @@ -206,14 +209,14 @@ fail: qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev); vfio_device_irq_unmask(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); return false; -#else - return true; -#endif } =20 static bool vfio_cpr_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) { -#ifdef CONFIG_KVM + if (!kvm_enabled()) { + return true; + } + if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || vdev->intx.route.mode !=3D PCI_INTX_ENABLED || !kvm_resamplefds_enabled()) { @@ -236,14 +239,14 @@ static bool vfio_cpr_intx_enable_kvm(VFIOPCIDevice *v= dev, Error **errp) vdev->intx.kvm_accel =3D true; trace_vfio_intx_enable_kvm(vdev->vbasedev.name); return true; -#else - return true; -#endif } =20 static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) { -#ifdef CONFIG_KVM + if (!kvm_enabled()) { + return; + } + PCIDevice *pdev =3D PCI_DEVICE(vdev); =20 if (!vdev->intx.kvm_accel) { @@ -277,7 +280,6 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) vfio_device_irq_unmask(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); =20 trace_vfio_intx_disable_kvm(vdev->vbasedev.name); -#endif } =20 static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) @@ -350,16 +352,14 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Err= or **errp) vdev->intx.pin =3D pin - 1; /* Pin A (1) -> irq[0] */ pci_config_set_interrupt_pin(pdev->config, pin); =20 -#ifdef CONFIG_KVM /* * Only conditional to avoid generating error messages on platforms * where we won't actually use the result anyway. */ - if (kvm_irqfds_enabled() && kvm_resamplefds_enabled()) { + if (kvm_enabled() && kvm_irqfds_enabled() && kvm_resamplefds_enabled()= ) { vdev->intx.route =3D pci_device_route_intx_to_irq(pdev, vdev->intx.pin); } -#endif =20 if (!vfio_notifier_init(vdev, &vdev->intx.interrupt, "intx-interrupt",= 0, errp)) { --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355591; cv=none; d=zohomail.com; s=zohoarc; b=QdPx83vZ0XyfTVVg/jkpornFxYFsyM8h4lNsENp31r97Yjva5Kicd80SOklo5A8e2eHB7D50koPYYssT5s/To6bMn5WJCqPNz/lYXHqk7jmbem0qXCsiYVmqKTGZKogx1PdFgRGdrN5eAbrVbfmW41FXlftCNuxHf4fuKJuxdlI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355591; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ydY86TmAe+pPLI175/rOgV0/f4nnjpoSuvgIKZX4zD8=; b=Y61zlmhsgccESqSuXEPzHplojL4Q5qzHX3iLjxmeX+EzvinhNkNOwB1oo+qNoo4Iz4n3y2NterToSH+sk/zFEe73NuCHTrQUYNwy+zZm637MdyBNOkg9Wlpnm5u1nPCAkQIQYtnHo7oyYiGxy4YHldM4CDsJK9t4vJStSRc9cRA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355591914650.0380160798651; Thu, 12 Mar 2026 15:46:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omQ-0007DD-20; Thu, 12 Mar 2026 18:45:23 -0400 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 1w0omD-00072i-JN for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:09 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0omB-0003Hr-DI for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:09 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2aea41d4fbcso7274165ad.3 for ; Thu, 12 Mar 2026 15:45:06 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355506; x=1773960306; 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=ydY86TmAe+pPLI175/rOgV0/f4nnjpoSuvgIKZX4zD8=; b=zGgSl66PVK5P9ZaU4h4lg5ZLIt6EpZUs/8X3OgHheHCZDKy0mKq73Ag3Du8oO0hWk+ QxmBVfiBbm9yjASuMlnPayLLm8Udh7cqS9ZKkQHs5Wj41yrLrZSLnxVvtKSHPUiEKVmY qNuiQwHQLUiqUo8ziGSxTl9AI1yiicsj0d/equYn9s+MOT/UWhFvH1Hs0EjzVzuid51C nxl7Ba/6uoZQGPWrk+fTLca4HH+IqHXBh7NwYR0TU8kNEdczIJQ+m7PSJqqSjfxJFiEo fmhJ4cwGgIAGqV5rzaGfTvEt+glEEBCX92eNArM94aBtSyJ7zimdACKwgUjNRU2BmTCD 7tuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355506; x=1773960306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ydY86TmAe+pPLI175/rOgV0/f4nnjpoSuvgIKZX4zD8=; b=eyoDfQeMTre8eYwsm8OqRylAuwDp7U6GjHGyvIw/0uuNOXPCIO0jGSudDmGJcF4ygi GZ2SVP3N9N5B1nw6weCTxooW+DNlddezomdJasTKvcZSy6WwiW/G17hn0foZ5Qn8Fv8Z ArRj5e1brFGtc9sTQgcyaSZbmg7JqVEiAs+1GEAvCPKdJyRhi1fzM4fhlZJNP6UDRWyo luFL3rkVZiFx+6rDioCM4AbTAB3vZpaVqMRXh0EY/QPuJxDjetZC32yX8xb91znafjWk KtCR4rtQlsn9GnGmD3j+1MykpmHf8xEMDj9khsxD3SGXUIkXnxSj8aYyvvf+S57qIeWY xaZA== X-Gm-Message-State: AOJu0YwJwHBOFqvUoiJCZSEZNa8cDDfgUrH2NhVLCgfnugmLj3nDDivQ WzdYcl7B0hA9YziecE4NDYz8XDQ3laaXhhbrQWwWxlmBfDfDM7jE+XQfa7Uha9jg970Wu+JQ03c yIZGImOE= X-Gm-Gg: ATEYQzz9c6pisjhg2wbeS4J6ubvThEwRV4Q0xf9+d6ypqhE8QrJ01L7gH5ii3ZNorHX /mEDtQQK5Gd1BtgZeSqU62aTrwJUtBEcyQp2AR/eEvrFHpgDf4pIb11ljVU2lwBueCra0UnuFWB LVGFpX2zfEktG/LsxRjLREFItCi1KwQsglnG4uo7Hfc04tBPspARFq6oLY+3yWaggc7q2Zo1EAF sEr10veW5+ldK9fdgLTOdqQ1oVI/YCzxn7a4oZUIRwIJfdMpxj/vFqINK8ltB/sR7HsB5th1WE5 39uuRQZ8ptUJm6Zqa2y+clwQJ053O4g3OYT5/wyr2nr15+p82rDq2sTtSnKv9HZPR+MrsXr7jUp jZZXiSW8Bv4WOSSWxrwdVLM+4MsAavf0LcTnAABH6/BvtZDs+dhmTkFfWFX8tbcffVIsH7OkXZ2 s/osU01YFeB9eYweIuG32EUr4Bo/s1YkLo9M0qt/JQIkBBbvIVOohhBOdl3SzmHKbqakZl17mCT 7em X-Received: by 2002:a17:903:230f:b0:2ae:3b36:23e7 with SMTP id d9443c01a7336-2aeca95fcebmr10982105ad.16.1773355505829; Thu, 12 Mar 2026 15:45:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 6/8] hw/vfio/ap.c: use full path for target specific header Date: Thu, 12 Mar 2026 15:44:47 -0700 Message-ID: <20260312224449.1605071-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355593898158500 Content-Type: text/plain; charset="utf-8" In addition, we fix target/s390x/kvm/kvm_s390x.h cpu-qom include also. Signed-off-by: Pierrick Bouvier Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/kvm/kvm_s390x.h | 2 +- hw/vfio/ap.c | 2 +- 2 files changed, 2 insertions(+), 2 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 =20 -#include "cpu-qom.h" +#include "target/s390x/cpu-qom.h" =20 struct kvm_s390_irq; =20 diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 856fa2678cd..3fae9ae9814 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -25,7 +25,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/core/qdev-properties.h" #include "hw/s390x/ap-bridge.h" --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355589; cv=none; d=zohomail.com; s=zohoarc; b=j8DkFDUFt/0DOttK/Qzrzo4eRxCsY7STw7sv8IDRi+a+LqIydt1hdteQ+p/xcxfwvQn6eFjoknjVD2tx1v/IGCnp3EbK4oGO8YySJ4seKLnrBxGnnYZkKLJRmXacbh2jukS/c+0M14d4dcRIYP6ewJzTCavwHfxA6SrXXoj0j7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355589; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qvpjWio/aBMSV+EUvl9/0Lsdx7SfDm44tLg19GLlZEY=; b=Qc2oGoVreNwI6PKgLOXOW6pYcTxm6NaG8oehgDk0WAA4ez/849T13HgOBLn1J/OrWEfM1ndrpdKirZfKqiSMR2+j7bx8uAb1hz0iaryGoliA+fZ/zi2IKPkkJxPOxgKSvasINg2bpmc2jmnemDdzRmXWsl0ouyAbF5sEYV18LMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355589833447.281801261596; Thu, 12 Mar 2026 15:46:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omX-0007Fl-Lv; Thu, 12 Mar 2026 18:45:29 -0400 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 1w0omE-00073Y-Mg for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:10 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0omC-0003IU-Kv for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:10 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c7393536e53so622077a12.2 for ; Thu, 12 Mar 2026 15:45:08 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355507; x=1773960307; 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=qvpjWio/aBMSV+EUvl9/0Lsdx7SfDm44tLg19GLlZEY=; b=YeDTLqhPbKuQPu9/3hAVjQFYoC4t5QrcM/CQe2FE0YgGF1qEy9pnTwkw+tSgMuNdZo 5U50vTzt1o/nmlBjC4YHGb/Oqd40HyykKYTlXpn8zKDGO+yjw3wMi0PyvNMCuejl00lF hJXCJoPpt47f2BRLMigv5fx5lwHCOgKoiPbUU+/Oslqdyb1Jcm2FBkalfDGuYb5aOUVT H1ahJLF54gvtIF9kOuwanRNwtzzUwR/tsnTH0rFnT58R8l4TEB189FcHOcLJ3oMhghUW Jyx+Fzn3Dh8s3hJIut8tpckp7grzgnYBAC8qtmM048pybx+f2/+H1hIZzE/FDNtSs/+r thpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355507; x=1773960307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qvpjWio/aBMSV+EUvl9/0Lsdx7SfDm44tLg19GLlZEY=; b=B0l7sjcEJ2k85Lg3K3JnVHtdhCEBXyyvjBaJNs2cPFwB92hQVHCKj9kYJhW+HNQmrp +TpLT+rKnDj0LtiFDuJmufYGIUo+CEn58W4oTwkfI1tDCfT1monqBrAOUTaWNZgQlR2P iUXa86Fmm0ebE/qWXe4ECfmda855QkqFUy8sBlPneWyT0FiUewFGGDZcWZxEmrFc0Gm1 FPa8nend1hCp5dJ7ruAVo/O+zzuo562iERYZoKNMEtjFFNvhGpZKbfXktRlIFjAnNK8t 7l9Tg8rcESqcjOfvb2jWaDTwtFv8qiiEKKYllqwrQEI3TEx0iQn774y9q7CwTmAZATzg pIdw== X-Gm-Message-State: AOJu0YyAACGlBzaRu5TUZGEbpgxKEFQBV1oWmd0KyG3jOIDieNFDbtli fikC9X+pJmHTUxafjq5t24pHkFgiDxB7ravHfo0kJy33eBNkqzxfWegl6Yp5ONmWy5DJ7gw55t/ o+PNNHyE= X-Gm-Gg: ATEYQzxQZQzEwX7uiKXcLBbP9XYkoiVfS4mMcL1MLVEmDhC5VsLSUWbzyi+ypTxcT+b YGu1IA4mI44Z23RDgw7TKl3rpIWXhticPRVqdEqHje8gyiuqNtj7s3yOzROYzMH/T9WiHMAOG3h yoogSA29HCs/EZL7J1byktWWZ5LECUSNlCyc1jVbMPkFLtlAip9s4l0wMxNYdZYi5SPU/kzpC1H kLSg5M9+jklXmGb1y4LD/FtR/waf15B2S+bHMiN1q27st4/Mu2FnRkZVGJp3D1zPVU3VuuC5C71 XPh9Xma+h6cB8bD18g8KRXDxeXKtKv84ZVCvrPTJ7wm8hCDu+3C9dMu+zHwXYQ3XXGYRvU8M+z5 MGuZ/gsuiJnwrjBznu9Kp/8W7GCh+9bbseyrZ3IOI+lm0HYL4c0i+v7pS6Wkspk4Md4peu0dLfY RpbrO9gCpUiKPHcOIEvubkR9vrMAhiNv8ypoyeWV2DzXk78nmgMyIks4bbosjxhMwWWBoAKOix9 yhx4/ShqQAChxY= X-Received: by 2002:a17:903:38cc:b0:2ae:54b2:27c7 with SMTP id d9443c01a7336-2aecaab1574mr10285735ad.39.1773355506712; Thu, 12 Mar 2026 15:45:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 7/8] hw/vfio/spapr.c: extract vfio_spapr_kvm_attach_tce to hw/vfio/kvm-spapr.c Date: Thu, 12 Mar 2026 15:44:48 -0700 Message-ID: <20260312224449.1605071-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x534.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355592590154100 Content-Type: text/plain; charset="utf-8" Since this function needs kvm specific types, we need to extract in another file and link it only for KVM builds. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/kvm-spapr.h | 12 ++++++++++++ hw/vfio/kvm-spapr.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ hw/vfio/kvm-stubs.c | 8 ++++++++ hw/vfio/spapr.c | 30 ++++------------------------- hw/vfio/meson.build | 1 + 5 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 hw/vfio/kvm-spapr.h create mode 100644 hw/vfio/kvm-spapr.c diff --git a/hw/vfio/kvm-spapr.h b/hw/vfio/kvm-spapr.h new file mode 100644 index 00000000000..1a7697a07a8 --- /dev/null +++ b/hw/vfio/kvm-spapr.h @@ -0,0 +1,12 @@ +/* + * Vfio spapr kvm specific functions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "hw/vfio/vfio-container.h" +#include "qapi/error.h" + +bool vfio_spapr_kvm_attach_tce(VFIOContainer *bcontainer, + MemoryRegionSection *section, + Error **errp); diff --git a/hw/vfio/kvm-spapr.c b/hw/vfio/kvm-spapr.c new file mode 100644 index 00000000000..6b9d04298c5 --- /dev/null +++ b/hw/vfio/kvm-spapr.c @@ -0,0 +1,47 @@ +/* + * Vfio spapr kvm specific functions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include +#include +#include + +#include "hw/vfio/vfio-container-legacy.h" +#include "hw/vfio/kvm-spapr.h" +#include "qapi/error.h" +#include "trace.h" +#include "vfio-helpers.h" + +bool vfio_spapr_kvm_attach_tce(VFIOContainer *bcontainer, + MemoryRegionSection *section, + Error **errp) +{ + VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); + VFIOGroup *group; + IOMMUMemoryRegion *iommu_mr =3D IOMMU_MEMORY_REGION(section->mr); + struct kvm_vfio_spapr_tce param; + struct kvm_device_attr attr =3D { + .group =3D KVM_DEV_VFIO_GROUP, + .attr =3D KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE, + .addr =3D (uint64_t)(unsigned long)¶m, + }; + + if (!memory_region_iommu_get_attr(iommu_mr, IOMMU_ATTR_SPAPR_TCE_FD, + ¶m.tablefd)) { + QLIST_FOREACH(group, &container->group_list, container_next) { + param.groupfd =3D group->fd; + if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) { + error_setg_errno(errp, errno, + "vfio: failed GROUP_SET_SPAPR_TCE for " + "KVM VFIO device %d and group fd %d", + param.tablefd, param.groupfd); + return false; + } + trace_vfio_spapr_group_attach(param.groupfd, param.tablefd); + } + } + return true; +} diff --git a/hw/vfio/kvm-stubs.c b/hw/vfio/kvm-stubs.c index 9593287d9c2..65aa1ef192c 100644 --- a/hw/vfio/kvm-stubs.c +++ b/hw/vfio/kvm-stubs.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include =20 +#include "hw/vfio/kvm-spapr.h" #include "hw/vfio/vfio-device.h" #include "qapi/error.h" #include "vfio-helpers.h" @@ -25,3 +26,10 @@ int vfio_kvm_device_del_fd(int fd, Error **errp) { return 0; } + +bool vfio_spapr_kvm_attach_tce(VFIOContainer *bcontainer, + MemoryRegionSection *section, + Error **errp) +{ + g_assert_not_reached(); +} diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index a9f093c3570..42690e4323d 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -16,6 +16,7 @@ #include "system/address-spaces.h" =20 #include "hw/vfio/vfio-container-legacy.h" +#include "hw/vfio/kvm-spapr.h" #include "hw/core/hw-error.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -406,33 +407,10 @@ vfio_spapr_container_add_section_window(VFIOContainer= *bcontainer, vfio_host_win_add(scontainer, section->offset_within_address_space, section->offset_within_address_space + int128_get64(section->size) - 1, pgsize); -#ifdef CONFIG_KVM - if (kvm_enabled()) { - VFIOGroup *group; - IOMMUMemoryRegion *iommu_mr =3D IOMMU_MEMORY_REGION(section->mr); - struct kvm_vfio_spapr_tce param; - struct kvm_device_attr attr =3D { - .group =3D KVM_DEV_VFIO_GROUP, - .attr =3D KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE, - .addr =3D (uint64_t)(unsigned long)¶m, - }; - - if (!memory_region_iommu_get_attr(iommu_mr, IOMMU_ATTR_SPAPR_TCE_F= D, - ¶m.tablefd)) { - QLIST_FOREACH(group, &container->group_list, container_next) { - param.groupfd =3D group->fd; - if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr))= { - error_setg_errno(errp, errno, - "vfio: failed GROUP_SET_SPAPR_TCE for= " - "KVM VFIO device %d and group fd %d", - param.tablefd, param.groupfd); - return false; - } - trace_vfio_spapr_group_attach(param.groupfd, param.tablefd= ); - } - } + if (kvm_enabled() && !vfio_spapr_kvm_attach_tce(bcontainer, section, e= rrp)) { + return false; } -#endif + return true; } =20 diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index 562ba79d1c0..06e24122c5c 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -10,6 +10,7 @@ vfio_ss.add(files( vfio_ss.add(when: 'CONFIG_KVM', if_true: files('kvm-helpers.c'), if_false: files('kvm-stubs.c')) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) +vfio_ss.add(when: ['CONFIG_KVM', 'CONFIG_PSERIES'], if_true: files('kvm-sp= apr.c')) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( 'pci-quirks.c', 'pci.c', --=20 2.47.3 From nobody Fri Mar 27 02:38:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773355602; cv=none; d=zohomail.com; s=zohoarc; b=PIhnQ/15WoWHs5i+iviJr2YzZKRq5gL+YDtBr/sWA4qXIcaKQzTC7MxJOS/3WIgzbSZdQ3vBfLcVDWwoEqktNqZML1PAOHl6LpRmj/UfSIFVysybdPe/LkrzvscsDaFpK6d/bV36bn/4CrKNLmJqEWnkpAWbS3NCiAFPuNIzzts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773355602; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iwRfh/sohnPunxfSN46Zr+FfMuNI+X4cXpBJVFqhXI4=; b=Fb+HXredEDBVoCsdTJ039iu9KPbjg/l4HW/3jlbJxNGT4Ut0k1m1Qe0YAZ7TW9Cjv5yAmfPYo+oAwLP2MgCpbBYTj69qkyZA0/TJvUqZo1iKxHdsWs1/UZJrffawCSFuMwRWQ7e78nM2F0rPJo+Z+9l9MevKwHjaIo0PyQSpdlA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773355602719214.22854771853963; Thu, 12 Mar 2026 15:46:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0omQ-0007DE-1f; Thu, 12 Mar 2026 18:45:23 -0400 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 1w0omE-00073V-Lc for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:10 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w0omD-0003J1-4K for qemu-devel@nongnu.org; Thu, 12 Mar 2026 18:45:10 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2aea41d4fbcso7274235ad.3 for ; Thu, 12 Mar 2026 15:45:08 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ed9cdsm128215ad.60.2026.03.12.15.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 15:45:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773355508; x=1773960308; 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=iwRfh/sohnPunxfSN46Zr+FfMuNI+X4cXpBJVFqhXI4=; b=N3pMI7wt6ZtcdijHUJg1/FmRHnIHSep6SewcHSOqn2yygjFuF+Xpjw4c3UbOANerVv c7RL5pMJIvTb3d3OTn9q1HhRTnH5k6X7WRnjn11sXNQhHJkL22exuHNxBzSWdU+DWxIJ wKJDMHdHdpmO4adBGHNrZJcQqLC3M6NLM2wf6GM22BQIOkTrgFF3bFzlOF981ZArWkzS epJ4QxuReHXZ0uzug8URttvhyp/dlMV0gavQhaMSicHGXAnKn1+afOy+1k3zncN9LqEf IhWrBwzwIBJUJ/LZuJ+X1cxN/H/GRmqPVOqFKUA0NcIHxTYIL0If2zljkRuGyECMkSEu sD0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773355508; x=1773960308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iwRfh/sohnPunxfSN46Zr+FfMuNI+X4cXpBJVFqhXI4=; b=YsXUcAn+tIj8FcIMvtQkz+MnjKBEwIlEjV7NBjvFT9yJxDFTsWTdkixPxXyqthUOxg pkAoBZ0s7Hx45VlcBzphaiOeE2tGqk99mc+uxlndafcCsmT0iW6gSHop3L4XYPOQm5aI rjQ1geolrntypCL1vA0mWiIu6Lqm4VGJXyZMWsrzujQwH6Po6GZ+vuMXJVba6Ddba41C P6wtVeZGExT0ljlqS+Az7azEIvT4deULBC7TJJiM/XAcb/SuDUJf2ogxHMycgVoG4ECO 2jNhHRHtMEDn684oLKyEAWn709Vt2LgSQ+eZddtJ5wbp3C7SgyGHHSYknZJc5d1W/hTK ynJQ== X-Gm-Message-State: AOJu0Yy3wv8aBDY6nctPwmHobNOiOlvfOSaLFqFDJmlNALvWOfpNlUS5 3dX9arRzUvCmv9zwCqhGJgHiV7u0XsA5/nS8Sw62WtsZCRPgdAKSqZxVVBxjGTfjWuEdx4vP+hQ gMhneDRo= X-Gm-Gg: ATEYQzwWwPPWDEx2jZ2qavGSmADqQHRSWI2XgIdb9xtttO67FyXhGMp35MkzLZoqY5S Wz2uKUys2qj2obvH3yvKUruVMFT8K8mqs8jZrrceNPW60RjpCa3FB+SeovSXhr8JLoLi4ni5CNe EPgmE17Vi0xjCWb4XTNy7Fti9VqDvSvxUHZcqLqXQftKv01nkmpop3mdHiZKPetrwQGkgqlN820 F9RGbMZ55uKK3C/juS1FpCAur2iKUz93jr15Lo5koZXCvDYxJ1/mm4Rc3LzdT4jC/aRRC8zkos2 +NDvoMvAoAQOUTILZt0/pxr9201u4PrE0dPVBsl73XNDcnJQPktWUt4SrS4mhVO6ICGfYsayupN 0wrqbb8AVhvgCtDZZOl1OzLV0R7KtZnOAFUwvwz3GatKfwDZeZGQV1b2xYTSP0SMeL0c24vm0Mi 1eNWBkUTebadUrry64GOrfCV5XjJ6i2YpBsvmOl6Y0TXNPCgfyt/SfCAYaITzh6TxI5aL0BjQxS WvK X-Received: by 2002:a17:902:f544:b0:2ae:bd12:f832 with SMTP id d9443c01a7336-2aecab1c781mr8399395ad.46.1773355507529; Thu, 12 Mar 2026 15:45:07 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , eric.auger@redhat.com, Pierrick Bouvier Subject: [PATCH 8/8] hw/vfio: all vfio files can now be common files Date: Thu, 12 Mar 2026 15:44:49 -0700 Message-ID: <20260312224449.1605071-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> References: <20260312224449.1605071-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773355604617154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 06e24122c5c..4553aed6a6f 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -20,7 +20,7 @@ vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c'= )) vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c'), if_false: files('igd-stubs.c')) =20 -specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) +system_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) =20 system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'cpr.c', --=20 2.47.3