gdbstub: move update guest debug to accel ops
PATCH v2 1/1 gdbstub: move update guest debug to accel ops
From: Mads Ynddal <[email protected]>
Continuing the refactor of a48e7d9e52 (gdbstub: move guest debug support check to ops) by removing hardcoded kvm_enabled() from generic cpu.c code, and replace it with a property of AccelOpsClass.
--- accel/kvm/kvm-accel-ops.c | 5 +++++ cpu.c | 11 ++++++++--- include/sysemu/accel-ops.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-)
accel/kvm/kvm-accel-ops.c +5 -0
@@ -86,6 +86,10 @@ static bool kvm_cpus_are_resettable(void)return !kvm_enabled () ||kvm_cpu_check_are_resettable (); } +static int kvm_update_guest_debug_ops (CPUState *cpu) { +return kvm_update_guest_debug (cpu,0 ); +} +static void kvm_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc);
@@ -99,6 +103,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm;#ifdef KVM_CAP_SET_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;
cpu.c +8 -3
@@ -31,8 +31,8 @@#include "hw/core/sysemu-cpu-ops.h" #include "exec/address-spaces.h" #endif +#include "sysemu/cpus.h" #include "sysemu/tcg.h" -#include "sysemu/kvm.h" #include "sysemu/replay.h" #include "exec/cpu-common.h" #include "exec/exec-all.h"
@@ -396,9 +396,14 @@ void cpu_single_step(CPUState *cpu, int enabled) {if (cpu->singlestep_enabled != enabled) { cpu->singlestep_enabled = enabled; -if (kvm_enabled ()) { -kvm_update_guest_debug (cpu,0 ); + +#if !defined(CONFIG_USER_ONLY ) +const AccelOpsClass *ops =cpus_get_accel (); +if (ops->update_guest_debug) { + ops->update_guest_debug (cpu); } +#endif +trace_breakpoint_singlestep (cpu->cpu_index, enabled); } }
include/sysemu/accel-ops.h +1 -0
@@ -48,6 +48,7 @@ struct AccelOpsClass {/* gdbstub hooks */ bool (*supports_guest_debug)(void ); +int (*update_guest_debug)(CPUState *cpu);int (*insert_breakpoint)(CPUState *cpu,int type,hwaddr addr,hwaddr len);int (*remove_breakpoint)(CPUState *cpu,int type,hwaddr addr,hwaddr len);void (*remove_all_breakpoints)(CPUState *cpu);
Signature · 1 line
2.38.1
Quoted 6 lines · Mads Ynddal
From: Mads Ynddal <[email protected]>
Continuing the refactor of
a48e7d9e52(gdbstub: move guest debug support check to ops) by removing hardcodedkvm_enabled()from genericcpu.ccode, and replace it with a property of AccelOpsClass.
Quoted 6 lines
Signed-off-by Mads Ynddal <[email protected]>--- accel/kvm/kvm-accel-ops.c | 5 +++++ cpu.c | 11 ++++++++--- include/sysemu/accel-ops.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-)
Alex Bennée
AppliedQuoted 7 lines · Mads Ynddal
From: Mads Ynddal <[email protected]>
Continuing the refactor of
a48e7d9e52(gdbstub: move guest debug support check to ops) by removing hardcodedkvm_enabled()from genericcpu.ccode, and replace it with a property of AccelOpsClass.Signed-off-by Mads Ynddal <[email protected]>
Queued to gdbstub/next, thanks.
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro