From nobody Wed Feb 11 05:37:56 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=1746487283; cv=none; d=zohomail.com; s=zohoarc; b=dX3PYDt99EJ0WRO4vxEJbTaI+hjswRywbGd1mEYguLYra1cnv8Htj7ZOZlLICJSGsuPf588nWQFJIIQrhTS74xV5xmJg24mjN+cSjcRy1bLOfg1KT1kuJzBTo7xBt6ej+ZB3hrpdQfQi8ZC4jdxnnWVCIKJ9gdG3BKPiSimz9EM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746487283; 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=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; b=MiCvIoliVIf3wJfRoSTvhOmbbf/4S2EcvtbN2DpKurdZI3+zgAdqXEizIrsH/eY7V1I+1ew3VtH5eYSIlCLSUppEg9gL+0vTSgP7ylLPnfTKWBHDs3+V7irC1eEC+Yglzllr91S+Kl3k6nt1QjEe6lLmgYpmhXdtSzuZ/HdsuR4= 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 1746487282683788.0666392446625; Mon, 5 May 2025 16:21:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uC56y-0006Eq-UB; Mon, 05 May 2025 19:20:37 -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 1uC56u-0006B0-LM for qemu-devel@nongnu.org; Mon, 05 May 2025 19:20:32 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uC56q-0003Vo-QQ for qemu-devel@nongnu.org; Mon, 05 May 2025 19:20:32 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22e09f57ed4so46777355ad.0 for ; Mon, 05 May 2025 16:20:28 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1522917asm60981715ad.201.2025.05.05.16.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 16:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746487227; x=1747092027; 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=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; b=nf8XECfeGsA9OAri0+1s74pesU0BUfeacuLepFagNtvHAz1VsqLiuLgAQiniigCtbW LLXeUpXCwjDeOK3oPf1ekzu4UcLoVn4os4JJqCXVW+6QBn1L1rI6Hdso+q19CYqYod77 71ayDvRIewNwVfLGuALx55+TcH0vsUlg+rZCau35U7IpNHC4e5S9A9jNdfNgxWYpdfCK nXCbPGLZM0Sr/dnnPOJW6VJamDnmt7+8/GtdLvPLEtuLE41bzJ16IEGLjWt8/TktnVO0 Db3R66IzRP5bvEOlVvde1NT4ozvv8fd7VmWg6CfE1IHjCxUS1oLfF6wLnWeBBcOVTrc5 qRXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746487227; x=1747092027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; b=ZOyF8quy4V9QWcsxVVzpJo+PCsf59ye7bZUoDuYOPoRWWkoKfNVopo/o0YCYp7vf4i YFuCOVVup0MbgdAPesxAGYcdPkMfavj3h7zLnHQ3XTdi3agiSn2SScnielC8xq+FmVwM +4DrAE/cHVCK02jUP80LIL+wByD4jVLC6FLL3U9RiwJG6T9u17nwr1cIhXUSsMlbQF5q GqBr+kYSeCrky5e0U26WGY+8Tod+GEMo8IXtswJGX0+2c9c1KPCrbCpJwWvbXk82soBE bIKvuii0UphKMI5IYoewcuk6gJoExOli81jgjqCM41Wh4dv00QNImsWbEU7z6VNXdI5Z /AUA== X-Gm-Message-State: AOJu0YzXLTQ7cslNujdpsF0VMoqzdE3lL0PgMNoTy/S/6DUIIiEyOExD tRWyn7jbmatDnPR86XvGtbn0uQM7bFJXcDNvrCu790Na87F1f4EcBItx51ae3UKM1a1zt5Qlomi dVjs= X-Gm-Gg: ASbGncvzVGaE08k/YSErI5gNZdzqukFIXO1ybk4AH17OD7wDxSXLGCVhlyd+EmG73ny nylIDqJQ/a6AMqPcoOMMt/BqcfMy7K20FFW9GSuURbULiWiEvlgoiVdsCLK8x8UCtPQ4kJ8luPE K9TM8oipy2O/fc1rMbtrYc0Alzyq6KlLDwwxkTCOu4SBzTNkuB9ez/iVXghqIjiFK8ctQTDXFU2 HzZhGyItxyrVnBI/V0k3JjZb8tmgGeCOFjau/i0y3qLG42VoyS7CunB38LGu5K4obKkTZ+jDBAY fb8ks6+kKID2lxxl6r/HF2uwL1tBYeFqOrF7HQ/m X-Google-Smtp-Source: AGHT+IG7ArAq090ldoo+ZdQVBej7m6q6ZuRLjsuSHiLmFUTOGIKSXlNLu8HuIseupKBtlS+wsj+7ew== X-Received: by 2002:a17:902:d486:b0:215:58be:334e with SMTP id d9443c01a7336-22e32776bf1mr17875875ad.10.1746487226858; Mon, 05 May 2025 16:20:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, anjo@rev.ng, Peter Maydell , alex.bennee@linaro.org, kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v6 07/50] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Mon, 5 May 2025 16:19:32 -0700 Message-ID: <20250505232015.130990-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505232015.130990-1-pierrick.bouvier@linaro.org> References: <20250505232015.130990-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::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.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: 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: 1746487284103116600 Allow to get rid of CONFIG_KVM in target/arm/cpu.c Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 2 ++ target/arm/cpu.c | 31 ------------------------------- target/arm/kvm-stub.c | 5 +++++ target/arm/kvm.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 7b9c7c4a148..d156c790b66 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -221,4 +221,6 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int = level); =20 void kvm_arm_enable_mte(Object *cpuobj, Error **errp); =20 +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level); + #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5e951675c60..07f279fec8c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1099,37 +1099,6 @@ static void arm_cpu_set_irq(void *opaque, int irq, i= nt level) } } =20 -static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) -{ -#ifdef CONFIG_KVM - ARMCPU *cpu =3D opaque; - CPUARMState *env =3D &cpu->env; - CPUState *cs =3D CPU(cpu); - uint32_t linestate_bit; - int irq_id; - - switch (irq) { - case ARM_CPU_IRQ: - irq_id =3D KVM_ARM_IRQ_CPU_IRQ; - linestate_bit =3D CPU_INTERRUPT_HARD; - break; - case ARM_CPU_FIQ: - irq_id =3D KVM_ARM_IRQ_CPU_FIQ; - linestate_bit =3D CPU_INTERRUPT_FIQ; - break; - default: - g_assert_not_reached(); - } - - if (level) { - env->irq_line_state |=3D linestate_bit; - } else { - env->irq_line_state &=3D ~linestate_bit; - } - kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); -#endif -} - static bool arm_cpu_virtio_is_big_endian(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index e34d3f5e6b4..4806365cdc5 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -104,3 +104,8 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu) { g_assert_not_reached(); } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + g_assert_not_reached(); +} diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 97de8c7e939..8f68aa10298 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2468,3 +2468,32 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) cpu->kvm_mte =3D true; } } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + ARMCPU *cpu =3D arm_cpu; + CPUARMState *env =3D &cpu->env; + CPUState *cs =3D CPU(cpu); + uint32_t linestate_bit; + int irq_id; + + switch (irq) { + case ARM_CPU_IRQ: + irq_id =3D KVM_ARM_IRQ_CPU_IRQ; + linestate_bit =3D CPU_INTERRUPT_HARD; + break; + case ARM_CPU_FIQ: + irq_id =3D KVM_ARM_IRQ_CPU_FIQ; + linestate_bit =3D CPU_INTERRUPT_FIQ; + break; + default: + g_assert_not_reached(); + } + + if (level) { + env->irq_line_state |=3D linestate_bit; + } else { + env->irq_line_state &=3D ~linestate_bit; + } + kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); +} --=20 2.47.2