From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, Chao Du <duchao@eswincomputing.com>
Subject: [PATCH 02/21] target/arm: kvm64: remove a redundant KVM_CAP_SET_GUEST_DEBUG probe
Date: Wed, 22 Nov 2023 22:42:00 -0600 [thread overview]
Message-ID: <20231123044219.896776-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231123044219.896776-1-richard.henderson@linaro.org>
From: Chao Du <duchao@eswincomputing.com>
The KVM_CAP_SET_GUEST_DEBUG is probed during kvm_init().
gdbserver will fail to start if the CAP is not supported.
So no need to make another probe here, like other targets.
Signed-off-by: Chao Du <duchao@eswincomputing.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231025070726.22689-1-duchao@eswincomputing.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/kvm64.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index 3c175c93a7..b8bb25a1ea 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -32,13 +32,9 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/ghes.h"
-static bool have_guest_debug;
void kvm_arm_init_debug(KVMState *s)
{
- have_guest_debug = kvm_check_extension(s,
- KVM_CAP_SET_GUEST_DEBUG);
-
max_hw_wps = kvm_check_extension(s, KVM_CAP_GUEST_DEBUG_HW_WPS);
hw_watchpoints = g_array_sized_new(true, true,
sizeof(HWWatchpoint), max_hw_wps);
@@ -1141,33 +1137,23 @@ static const uint32_t brk_insn = 0xd4200000;
int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
{
- if (have_guest_debug) {
- if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4, 0) ||
- cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk_insn, 4, 1)) {
- return -EINVAL;
- }
- return 0;
- } else {
- error_report("guest debug not supported on this kernel");
+ if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4, 0) ||
+ cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk_insn, 4, 1)) {
return -EINVAL;
}
+ return 0;
}
int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
{
static uint32_t brk;
- if (have_guest_debug) {
- if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk, 4, 0) ||
- brk != brk_insn ||
- cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4, 1)) {
- return -EINVAL;
- }
- return 0;
- } else {
- error_report("guest debug not supported on this kernel");
+ if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk, 4, 0) ||
+ brk != brk_insn ||
+ cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4, 1)) {
return -EINVAL;
}
+ return 0;
}
/* See v8 ARM ARM D7.2.27 ESR_ELx, Exception Syndrome Register
--
2.34.1
next prev parent reply other threads:[~2023-11-23 4:43 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-23 4:41 [PATCH for-9.0 00/21] target/arm: kvm cleanups Richard Henderson
2023-11-23 4:41 ` [PATCH 01/21] accel/kvm: Make kvm_has_guest_debug static Richard Henderson
2023-11-23 11:30 ` Philippe Mathieu-Daudé
2023-11-26 23:36 ` Gavin Shan
2023-11-23 4:42 ` Richard Henderson [this message]
2023-11-24 12:03 ` [PATCH 02/21] target/arm: kvm64: remove a redundant KVM_CAP_SET_GUEST_DEBUG probe Philippe Mathieu-Daudé
2023-11-26 23:39 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 03/21] target/arm/kvm: Merge kvm_arm_init_debug into kvm_arch_init Richard Henderson
2023-11-23 11:31 ` Philippe Mathieu-Daudé
2023-11-26 23:42 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 04/21] target/arm/kvm: Move kvm_arm_verify_ext_dabt_pending and unexport Richard Henderson
2023-11-23 11:32 ` Philippe Mathieu-Daudé
2023-11-26 23:46 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 05/21] target/arm/kvm: Move kvm_arm_copy_hw_debug_data " Richard Henderson
2023-11-23 11:32 ` Philippe Mathieu-Daudé
2023-11-26 23:48 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 06/21] target/arm/kvm: Move kvm_arm_hw_debug_active " Richard Henderson
2023-11-23 11:34 ` Philippe Mathieu-Daudé
2023-11-26 23:51 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 07/21] target/arm/kvm: Move kvm_arm_handle_debug " Richard Henderson
2023-11-23 11:35 ` Philippe Mathieu-Daudé
2023-11-26 23:53 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 08/21] target/arm/kvm: Unexport kvm_arm_{get, put}_virtual_time Richard Henderson
2023-11-23 11:40 ` Philippe Mathieu-Daudé
2023-11-26 23:55 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 09/21] target/arm/kvm: Inline kvm_arm_steal_time_supported Richard Henderson
2023-11-23 11:41 ` Philippe Mathieu-Daudé
2023-11-26 23:57 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 10/21] target/arm/kvm: Move kvm_arm_get_host_cpu_features and unexport Richard Henderson
2023-11-24 11:37 ` Philippe Mathieu-Daudé
2023-11-27 0:01 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 11/21] target/arm/kvm: Use a switch for kvm_arm_cpreg_level Richard Henderson
2023-11-23 11:42 ` Philippe Mathieu-Daudé
2023-11-27 0:06 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 12/21] target/arm/kvm: Move kvm_arm_cpreg_level and unexport Richard Henderson
2023-11-24 11:34 ` Philippe Mathieu-Daudé
2023-11-27 0:08 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 13/21] target/arm/kvm: Move kvm_arm_reg_syncs_via_cpreg_list " Richard Henderson
2023-11-23 11:43 ` Philippe Mathieu-Daudé
2023-11-27 0:11 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 14/21] target/arm/kvm: Merge kvm64.c into kvm.c Richard Henderson
2023-11-24 11:41 ` Philippe Mathieu-Daudé
2023-11-27 0:14 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 15/21] target/arm/kvm: Unexport kvm_arm_vcpu_init Richard Henderson
2023-11-23 11:44 ` Philippe Mathieu-Daudé
2023-11-27 0:17 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 16/21] target/arm/kvm: Unexport kvm_arm_vcpu_finalize Richard Henderson
2023-11-23 11:44 ` Philippe Mathieu-Daudé
2023-11-27 0:18 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 17/21] target/arm/kvm: Unexport kvm_arm_init_cpreg_list Richard Henderson
2023-11-23 17:33 ` Philippe Mathieu-Daudé
2023-11-27 0:20 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 18/21] target/arm/kvm: Init cap_has_inject_serror_esr in kvm_arch_init Richard Henderson
2023-11-24 11:49 ` Philippe Mathieu-Daudé
2023-11-24 11:54 ` Philippe Mathieu-Daudé
2023-12-11 17:09 ` Richard Henderson
2023-12-11 18:43 ` Philippe Mathieu-Daudé
2023-12-11 18:58 ` Richard Henderson
2023-11-27 0:21 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 19/21] target/arm/kvm: Unexport kvm_{get,put}_vcpu_events Richard Henderson
2023-11-23 17:34 ` Philippe Mathieu-Daudé
2023-11-27 0:23 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 20/21] target/arm/kvm: Unexport and tidy kvm_arm_sync_mpstate_to_{kvm, qemu} Richard Henderson
2023-11-24 12:05 ` Philippe Mathieu-Daudé
2023-12-11 14:34 ` Peter Maydell
2023-12-11 18:43 ` Philippe Mathieu-Daudé
2023-11-27 0:28 ` Gavin Shan
2023-11-23 4:42 ` [PATCH 21/21] target/arm/kvm: Unexport kvm_arm_vm_state_change Richard Henderson
2023-11-24 11:33 ` Philippe Mathieu-Daudé
2023-11-27 0:29 ` Gavin Shan
2023-11-23 17:40 ` [PATCH for-9.0 00/21] target/arm: kvm cleanups Philippe Mathieu-Daudé
2023-11-23 19:14 ` Philippe Mathieu-Daudé
2023-11-24 12:05 ` Philippe Mathieu-Daudé
2023-12-11 14:35 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231123044219.896776-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=duchao@eswincomputing.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).