Correct gdbstub support requires some gdbstub_supported_sstep_flags.
Apparently missed in commit d7482ffe975 ("whpx: Added support for
breakpoints and stepping"), even with the recent 19b48084f71 ("whpx:
i386: re-enable guest debug support") fixes.Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Daniel Henrique Barboza <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Message-ID: <[email protected]> --- include/system/whpx-all.h | 1 + accel/whpx/whpx-common.c | 1 + target/arm/whpx/whpx-all.c | 5 +++++ target/i386/whpx/whpx-all.c | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/include/system/whpx-all.h b/include/system/whpx-all.h index 4022571ffff..0e2d333e919 100644 --- a/include/system/whpx-all.h +++ b/include/system/whpx-all.h @@ -23,6 +23,7 @@ void whpx_arch_destroy_vcpu(CPUState *cpu); void whpx_arch_accel_class_init(ObjectClass *oc); /* called by whpx-accel-ops */ +int whpx_arch_gdbstub_sstep_flags(AccelState *as); bool whpx_arch_supports_guest_debug(void); #endif diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index 247e12db812..e3f93efc61f 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -527,6 +527,7 @@ static void whpx_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = whpx_accel_init; ac->pre_resume_vm = whpx_pre_resume_vm; ac->allowed = &whpx_allowed; + ac->gdbstub_supported_sstep_flags = whpx_arch_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, whpx_set_kernel_irqchip, diff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c index 3079c6293c8..5208d7e1dfe 100644 --- a/target/arm/whpx/whpx-all.c +++ b/target/arm/whpx/whpx-all.c @@ -295,6 +295,11 @@ void whpx_translate_cpu_breakpoints( /* Breakpoints aren’t supported on this platform */ } +int whpx_arch_gdbstub_sstep_flags(AccelState *as) +{ + return 0; +} + bool whpx_arch_supports_guest_debug(void) { return false; diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index e626acef2f0..f6e1636a4e0 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1853,6 +1853,11 @@ void whpx_apply_breakpoints( } } +int whpx_arch_gdbstub_sstep_flags(AccelState *as) +{ + return SSTEP_ENABLE; +} + bool whpx_arch_supports_guest_debug(void) { return true; -- 2.53.0
