From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 134193101A7 for ; Wed, 1 Apr 2026 20:18:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775074695; cv=none; b=X4OKVIE3/ZpeeQBeheaASsQHZfnku2MtG29wGiDrjkWFcP5zEa4Ir4hvTscZUGQZSHk7uMphlFC8k1zHPiUjNiU72YQ5ohkFr/dxFbaZAlPb8X0EWmGIQKkbmurUg8XVajq87BuBktAM33V7V5Gk+aXghf9gtHtOHsTHbZL4GIQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775074695; c=relaxed/simple; bh=KvGLQgxilscIaTSiKKfw9HMM646pRhih6YSYSgC2pxc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=moivWju+MMBShkXzd+dvA6ivevL+7HGne+MSgZqdJsylRqwtnw255hg7P6ItIbF+I+oHdH1TXlZx+n16x3iaK3YW8qNbDk87bF2HhMnqMHIyQVVVTcBmfXWW0Um6Up/zJoj+iDbMRMLvUzl7HIjEftVbI7p6UAW+qdqGtfF5PxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=h8Lh9L3E; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="h8Lh9L3E" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4887f49ec5aso1574835e9.1 for ; Wed, 01 Apr 2026 13:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775074692; x=1775679492; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S1TEVy+T6k35I4U9/R8HmPKI1jXLjO9MCcFaUnfIfQ4=; b=h8Lh9L3Ey/6VG3t2p9U9v6bGD6ZjDx9g5dIYduZ/viR2OkbElUxah0VCPXwwQcz3hI J1fhHV0hj1cCEMkZ1MxZvC2sTcpwmnV08llIH8kBWnDNGj+ysOGTnRNevntfKn4XY3N8 fHYS65IhUrOB4x6XiLizAC8EXe87wMre+qno0XjHXznVNE2W504MBamvhAEhxD3F5j9n 2eoQTXB2gxp/zi+VUfOMiekdFvH4cS1gicuGWiR2aa1TKJZrpnLaaCk/gEvLxOu9AW9c HqeHz+aZn9Y0ZUbEVE9ozP0KLvAyHeK5Y84E+FOMemZU1G/5ZIBnk8qpNw0wazqLJAu+ 0huA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775074692; x=1775679492; 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=S1TEVy+T6k35I4U9/R8HmPKI1jXLjO9MCcFaUnfIfQ4=; b=ZuhIjLCN4pXNzLAHoXEAauycJQGoq+/S3j09s0JWimq7KJIx8axNynoM5es4gEOuMF J0A+txynq/kEAhCaY8sRDhBK+KR94eh/wI3/Q0WJFJGjm1gSUo2uIozAIVRN31VNcvTk DHshRAEJydsAykP4QUuYwGk5debiqWtod/r2Dl6NI+0dMJ/J88eTZEyomokvcyhcMZF/ R+6QbVgvooTIJgWrt1ugRIOgJPtAf1tOF04+v6EyftDTjkCLDgKI8qy8n6VyS7Lc3RuD iiTnbp2N1HmXAEQF6tocmddxTxb8fV7YCyRtFedcYRlWr3ZhbLiwkolyaJYmeO07Ig0I mObw== X-Forwarded-Encrypted: i=1; AJvYcCVa202ENcGzP7ePGf7LvniW5sqhaYE7z5xD5LPiX9tG1uHCf1eC1ctVrLPFBsSaXz96b4Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwRxZP0z35Ycu73W7Gv+GwgZNLSjOb+k9x0pBRpotZjIz0oYbB5 xQO7t/wGg9fnYR5NR0mkiXKgfEWDQKfqwX6uDHCOm/wgYNVE1RdUIpjgm+7Oh9paLtw= X-Gm-Gg: ATEYQzxBj75w7ZjkDzECGM7Qim+Ih9Ka6gk7t/MtMF7GwYF3NKjpmxowMFpSr8wR33E eOimkT1uoFMJ3dxTSHcciJzqGr98lUXN/zK/abbjvPz5xoGbG3f6podTb/cWdIrj6u2QP7qoR1X RzZcvb/FgBM2H8vt+zwgSEtTsf2lYNkqRH1vNxOV78tPtB3MKi8nw2EVN8qmn194YHAxRA1TVNa kSB6JDD7ehXR2tZ7r2YOmKWHp6QOljEvxaDemsooqH3a9g5NOxlXAuMw/oU4vf9ByWk0aA6xVnQ 8FqV2z+G93VQqLoELKvr4DtS5yAGo5veLtuCROvKwHVdgxQLKImdn7GqjF8i/YlnwbNs3MLV1oi xx/b1+4kcc3KEBaVXLjeQlksT5ztzGP1x0OQsL3BkCbQnvB07hVFk2EWQWIHJEvtQ6GUOuy1C+p mrTIQI2XfgiITgbL0ho8Tc39I8d7k0YvKheGafZdZWocfggiI7xKZyRaFyxULxPKSxjgsKLjHp X-Received: by 2002:a05:600c:34c4:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-48883597b55mr94970015e9.23.1775074692245; Wed, 01 Apr 2026 13:18:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888955d711sm39365835e9.9.2026.04.01.13.18.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 01 Apr 2026 13:18:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Alistair Francis , Palmer Dabbelt , Paolo Bonzini , Matthew Rosato , Daniel Henrique Barboza , Pierrick Bouvier , kvm@vger.kernel.org, Peter Maydell , Huacai Chen , qemu-riscv@nongnu.org, Alexander Graf , Pedro Barbuda , Anton Johansson , Song Gao , Weiwei Li , Aleksandar Rikalo , Liu Zhiwei , Cornelia Huck , qemu-s390x@nongnu.org, Chao Liu , Bibo Mao , qemu-arm@nongnu.org, Jiaxun Yang , Mohamed Mediouni , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Subject: [PATCH-for-11.1 2/8] accel/kvm: Remove TARGET_KVM_HAVE_GUEST_DEBUG Date: Wed, 1 Apr 2026 22:17:46 +0200 Message-ID: <20260401201753.92290-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260401201753.92290-1-philmd@linaro.org> References: <20260401201753.92290-1-philmd@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All targets except MIPS have TARGET_KVM_HAVE_GUEST_DEBUG=y. Declare the kvm_update_guest_debug() stub to MIPS and have TARGET_KVM_HAVE_GUEST_DEBUG be the default. Signed-off-by: Philippe Mathieu-Daudé --- configs/targets/aarch64-softmmu.mak | 1 - configs/targets/i386-softmmu.mak | 1 - configs/targets/loongarch64-softmmu.mak | 1 - configs/targets/ppc-softmmu.mak | 1 - configs/targets/ppc64-softmmu.mak | 1 - configs/targets/riscv64-softmmu.mak | 1 - configs/targets/s390x-softmmu.mak | 1 - configs/targets/x86_64-softmmu.mak | 1 - include/system/kvm.h | 7 ------- include/system/kvm_int.h | 2 -- accel/kvm/kvm-accel-ops.c | 4 ---- accel/kvm/kvm-all.c | 13 ++----------- target/mips/kvm.c | 5 +++++ 13 files changed, 7 insertions(+), 32 deletions(-) diff --git a/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-softmmu.mak index d34aead41c4..6f60ca6505c 100644 --- a/configs/targets/aarch64-softmmu.mak +++ b/configs/targets/aarch64-softmmu.mak @@ -1,6 +1,5 @@ TARGET_ARCH=aarch64 TARGET_BASE_ARCH=arm -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml aarch64-pauth.xml aarch64-sme2.xml # needed by boot.c TARGET_NEED_FDT=y diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmmu.mak index 38a8f85201f..2eef68dc55e 100644 --- a/configs/targets/i386-softmmu.mak +++ b/configs/targets/i386-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=i386 -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= i386-32bit.xml TARGET_LONG_BITS=32 diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loongarch64-softmmu.mak index 476407f9413..7e0b1ab5d05 100644 --- a/configs/targets/loongarch64-softmmu.mak +++ b/configs/targets/loongarch64-softmmu.mak @@ -1,6 +1,5 @@ TARGET_ARCH=loongarch64 TARGET_BASE_ARCH=loongarch -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= loongarch-base32.xml loongarch-base64.xml loongarch-fpu.xml loongarch-lsx.xml loongarch-lasx.xml # all boards require libfdt TARGET_NEED_FDT=y diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak index 867898bd47c..c47887f8992 100644 --- a/configs/targets/ppc-softmmu.mak +++ b/configs/targets/ppc-softmmu.mak @@ -1,5 +1,4 @@ TARGET_ARCH=ppc TARGET_BIG_ENDIAN=y -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= power-core.xml power-fpu.xml power-altivec.xml power-spe.xml TARGET_LONG_BITS=32 diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak index 10d7a2681e7..8c6dc84b821 100644 --- a/configs/targets/ppc64-softmmu.mak +++ b/configs/targets/ppc64-softmmu.mak @@ -1,7 +1,6 @@ TARGET_ARCH=ppc64 TARGET_BASE_ARCH=ppc TARGET_BIG_ENDIAN=y -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml # all boards require libfdt TARGET_NEED_FDT=y diff --git a/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-softmmu.mak index 5059c550480..e0d2c7032d6 100644 --- a/configs/targets/riscv64-softmmu.mak +++ b/configs/targets/riscv64-softmmu.mak @@ -1,6 +1,5 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fpu.xml riscv-64bit-virtual.xml riscv-32bit-cpu.xml riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=y diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak index e273075f1a9..699e5ced96f 100644 --- a/configs/targets/s390x-softmmu.mak +++ b/configs/targets/s390x-softmmu.mak @@ -1,6 +1,5 @@ TARGET_ARCH=s390x TARGET_BIG_ENDIAN=y -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-virt-kvm.xml s390-gs.xml TARGET_LONG_BITS=64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=y diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-softmmu.mak index c7f8746b4f5..491173df466 100644 --- a/configs/targets/x86_64-softmmu.mak +++ b/configs/targets/x86_64-softmmu.mak @@ -1,6 +1,5 @@ TARGET_ARCH=x86_64 TARGET_BASE_ARCH=i386 -TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= i386-64bit.xml i386-64bit-apx.xml TARGET_LONG_BITS=64 diff --git a/include/system/kvm.h b/include/system/kvm.h index 12f7fc8fb58..a2463a3ac3f 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -236,14 +236,7 @@ void kvm_irqchip_change_notify(void); * calling down to kvm_arch_update_guest_debug after the generic * fields have been set. */ -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); -#else -static inline int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) -{ - return -EINVAL; -} -#endif /* internal API */ diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h index 0876aac938d..9d1d3fd3deb 100644 --- a/include/system/kvm_int.h +++ b/include/system/kvm_int.h @@ -113,9 +113,7 @@ struct KVMState struct kvm_coalesced_mmio_ring *coalesced_mmio_ring; bool coalesced_flush_in_progress; int vcpu_events; -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG QTAILQ_HEAD(, kvm_sw_breakpoint) kvm_sw_breakpoints; -#endif int max_nested_state_len; int kvm_shadow_mem; bool kernel_irqchip_allowed; diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 6d9140e549f..d4af6b416c3 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -85,12 +85,10 @@ static bool kvm_cpus_are_resettable(void) return !kvm_enabled() || !kvm_state->guest_state_protected; } -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG static int kvm_update_guest_debug_ops(CPUState *cpu) { return kvm_update_guest_debug(cpu, 0); } -#endif static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) { @@ -105,13 +103,11 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; ops->handle_interrupt = generic_handle_interrupt; -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG ops->update_guest_debug = kvm_update_guest_debug_ops; ops->supports_guest_debug = kvm_supports_guest_debug; ops->insert_breakpoint = kvm_insert_breakpoint; ops->remove_breakpoint = kvm_remove_breakpoint; ops->remove_all_breakpoints = kvm_remove_all_breakpoints; -#endif } static const TypeInfo kvm_accel_ops_type = { diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 774499d34f8..9a46a61b7f5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2919,9 +2919,7 @@ static int kvm_init(AccelState *as, MachineState *ms) s->sigmask_len = 8; accel_blocker_init(); -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG QTAILQ_INIT(&s->kvm_sw_breakpoints); -#endif QLIST_INIT(&s->kvm_parked_vcpus); s->fd = qemu_open_old(s->device ?: "/dev/kvm", O_RDWR); if (s->fd == -1) { @@ -3032,23 +3030,19 @@ static int kvm_init(AccelState *as, MachineState *ms) kvm_vm_attributes_allowed = (kvm_check_extension(s, KVM_CAP_VM_ATTRIBUTES) > 0); -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG kvm_has_guest_debug = (kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG) > 0); -#endif kvm_sstep_flags = 0; if (kvm_has_guest_debug) { - kvm_sstep_flags = SSTEP_ENABLE; - -#if defined TARGET_KVM_HAVE_GUEST_DEBUG int guest_debug_flags = kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG2); + kvm_sstep_flags = SSTEP_ENABLE; + if (guest_debug_flags & KVM_GUESTDBG_BLOCKIRQ) { kvm_sstep_flags |= SSTEP_NOIRQ; } -#endif } kvm_state = s; @@ -3781,7 +3775,6 @@ bool kvm_arm_supports_user_irq(void) return kvm_check_extension(kvm_state, KVM_CAP_ARM_USER_IRQ); } -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, vaddr pc) { struct kvm_sw_breakpoint *bp; @@ -3941,8 +3934,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu) } } -#endif /* !TARGET_KVM_HAVE_GUEST_DEBUG */ - static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) { KVMState *s = kvm_state; diff --git a/target/mips/kvm.c b/target/mips/kvm.c index a85e162409c..49bff68b137 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -1262,6 +1262,11 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) abort(); } +int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) +{ + return -EINVAL; +} + int kvm_arch_get_default_type(MachineState *machine) { #if defined(KVM_CAP_MIPS_VZ) -- 2.53.0