From nobody Tue Feb 10 08:41:02 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=1770351868; cv=none; d=zohomail.com; s=zohoarc; b=HZaqkABU6HUsA1xh4yT6ZB7O5cw51zA9wa3uQ/zpdoP03pgs6YTj5/iK04QDR8XM/6KypGvpL7bQQwJLmS0/cvaeMLVkn13kZGFks0tjnyHNbeTZ4qrWuniJUJeARNG8g20ZH97/RVqVqivvenaQa1XMer4yRaR0PWshQz+BiZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770351868; h=Content-Type: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=msDy34BXNBauha6BX6yiPrC2FkV4a2ByUqGrOK5VCFU=; b=PT16KGIKFvGY0Li4reo+dYwa3XGSzrLaxcTlY57Hsh16nXWMuQnV40VwwnSPrMxS4YDLNBrj42hmnP1YicKsdea5KanvwG9BzlC5rpvZ9SmpXgmCPfMjrKu6JFGXaBHXML/Y6BF2WlRLJZaBrf+ouWdF/dNoxDJtUA+P1pAA5Fw= 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 1770351868216315.32075670204244; Thu, 5 Feb 2026 20:24:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voDM7-0004Jx-NA; Thu, 05 Feb 2026 23:22:07 -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 1voDM6-0004JB-L5 for qemu-devel@nongnu.org; Thu, 05 Feb 2026 23:22:06 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voDM3-0003Pw-6p for qemu-devel@nongnu.org; Thu, 05 Feb 2026 23:22:06 -0500 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-c6541e35fc0so990691a12.3 for ; Thu, 05 Feb 2026 20:22:02 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8244168fdf5sm926914b3a.17.2026.02.05.20.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Feb 2026 20:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770351721; x=1770956521; 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=msDy34BXNBauha6BX6yiPrC2FkV4a2ByUqGrOK5VCFU=; b=r3EJKRlOfCw78gptDtHTZjogy4jUyP8Xn4K9HL1R4RQ2QGfkP+hLSlfSSL9QsGI2zH 4hKRQX0LmtjOke669hJ5QjwLIWpKrnlTq/N31it76eFS1mSOK7VZsS6Xa5soMpqKT9EP VfC9hsLum2qgkZJUaTEWpynA7y/54Kto5+MVfeOo2BOTD+FZvoHAtKVeHnFS1T+RtJS8 WWuIHl1Ie96/8WP6r9wZF1xi0aVPXFu3J83sbAscY++k9WUsIzuAMVb6H6Gyj/U2iXQQ Sp0QaynGsjBD+3m1jaF/qr1m8Lw54iRI15zGX12ji2ngY9tdl+hJmqK5KyLRbqyNB8Gx daAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770351721; x=1770956521; 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=msDy34BXNBauha6BX6yiPrC2FkV4a2ByUqGrOK5VCFU=; b=FtMcLxVadjvdH54rRULo6ZDzzWq1gY9DyvQMHNqWQifIxgYY0ZwF9M+11ZEZJx9Xgo 1MNlAOqOq256yBAngIsAaP5z3DkrtUCwcjvgMG0DmfpjaOTdopiWwhT+qJ5oOl752ZX4 RwMCfZN2wHsuSk2r0uXhlz2iC7sGpyjhGXWaUQyB+aa9jiyzA95wAMGh5Hkuis4QawU3 EwhVBkQ7i/535zg0d219nLPLV9rCLxV2mNcFTdU5JSKY8HfqofcVNksauPS+td13qn3Q RNMjqVIKmXcK3eAm/YisLSuYSgkPBRPCoexDpKobsYKUyLAMxhbc80Cxfm18OvO8onZR h02Q== X-Gm-Message-State: AOJu0Yy28IC16Y4WZq9FJx2FqSbbpvlxhDE9jVAG3uS7fhfRUbeOs2O2 /WZpMDP1+jWXyJrcsEonthD8A9KcxELeVJe6okt5B3RqfN8Dr4gJNyMKSRNoPco7P8iD5HK/W8i AlX7d X-Gm-Gg: AZuq6aJtBvb6A5DV2tbtT1YuK8Va8mxDdWfi5jywiFkipbZdeuzSTgsVHo5kqxMD2sG WwJ/9cVOCVreetmkiDD0of5++6clHy/vNI/SYYa0risiXIkFCCOsa3GGP1IdU1hn2kOtDAHiqxi NZpgG2UfD6uq/D4YLJkblIyATGhSTAKBIIBuimbSLHsFQaicDTgJeNgirRTgIagEn4TyCH0+I33 heXNten5d082xy6aduTrgUMo2LqBeLo4ncLg/tXgSaStDgDSaKe/hie834rOhHb6A5HxEwNGAkV e84HCLoKR39JcqzjV+vdVJ4ofoXB+MJrbsEQm9vlquxZsv+9FesrxfuedfEKKrliFNikIKyNJAN xR7E4MRZYDVvcGy+gtIrZw82BiRTfzlHmUGaqO4wayR6Daf66nIKNo/2jll8t3AvCeCP/2R+EGn v9n1CHQK/3rahNAa57K4aLzQ2Cl2BlMDmqfmus3oakxn5+Y63F68oJMIk1B5KPXuhr X-Received: by 2002:a17:90b:1650:b0:339:ec9c:b275 with SMTP id 98e67ed59e1d1-354b3c41871mr1384005a91.6.1770351721024; Thu, 05 Feb 2026 20:22:01 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: anjo@rev.ng, Richard Henderson , Jim MacArthur , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , kvm@vger.kernel.org, qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 01/12] target/arm/arm-qmp-cmds.c: make compilation unit common Date: Thu, 5 Feb 2026 20:21:39 -0800 Message-ID: <20260206042150.912578-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206042150.912578-1-pierrick.bouvier@linaro.org> References: <20260206042150.912578-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::536; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x536.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: 1770351870768154100 Move gic_cap_kvm_probe to target/arm/kvm.c to remove #ifdef CONFIG_KVM. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 3 +++ target/arm/arm-qmp-cmds.c | 27 +++------------------------ target/arm/kvm-stub.c | 5 +++++ target/arm/kvm.c | 21 +++++++++++++++++++++ target/arm/meson.build | 2 +- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 6a9b6374a6d..cc0b374254e 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -11,6 +11,7 @@ #ifndef QEMU_KVM_ARM_H #define QEMU_KVM_ARM_H =20 +#include "qapi/qapi-types-misc-arm.h" #include "system/kvm.h" #include "target/arm/cpu-qom.h" =20 @@ -263,4 +264,6 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp); =20 void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level); =20 +void arm_gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3); + #endif diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index 45df15de782..83ec95c290f 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -43,29 +43,6 @@ static GICCapability *gic_cap_new(int version) return cap; } =20 -static inline void gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3) -{ -#ifdef CONFIG_KVM - int fdarray[3]; - - if (!kvm_arm_create_scratch_host_vcpu(fdarray, NULL)) { - return; - } - - /* Test KVM GICv2 */ - if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) { - v2->kernel =3D true; - } - - /* Test KVM GICv3 */ - if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) { - v3->kernel =3D true; - } - - kvm_arm_destroy_scratch_host_vcpu(fdarray); -#endif -} - GICCapabilityList *qmp_query_gic_capabilities(Error **errp) { GICCapabilityList *head =3D NULL; @@ -74,7 +51,9 @@ GICCapabilityList *qmp_query_gic_capabilities(Error **err= p) v2->emulated =3D true; v3->emulated =3D true; =20 - gic_cap_kvm_probe(v2, v3); + if (kvm_enabled()) { + arm_gic_cap_kvm_probe(v2, v3); + } =20 QAPI_LIST_PREPEND(head, v2); QAPI_LIST_PREPEND(head, v3); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index c93462c5b9b..ea67deea520 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -124,3 +124,8 @@ bool kvm_arm_cpu_post_load(ARMCPU *cpu) { g_assert_not_reached(); } + +void arm_gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3) +{ + g_assert_not_reached(); +} diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 3e35570f15f..ded582e0da0 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2580,3 +2580,24 @@ void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int= level) } kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); } + +void arm_gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3) +{ + int fdarray[3]; + + if (!kvm_arm_create_scratch_host_vcpu(fdarray, NULL)) { + return; + } + + /* Test KVM GICv2 */ + if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) { + v2->kernel =3D true; + } + + /* Test KVM GICv3 */ + if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) { + v3->kernel =3D true; + } + + kvm_arm_destroy_scratch_host_vcpu(fdarray); +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 462c71148d2..1a1bcde2601 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -16,7 +16,7 @@ arm_common_ss.add(files( 'mmuidx.c', )) =20 -arm_system_ss.add(files( +arm_common_system_ss.add(files( 'arm-qmp-cmds.c', )) arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm= .c')) --=20 2.47.3