With guest debug and breakpoint handling now migrated to struct KVMCPUOps, accel/kvm dispatches dynamically via ops. If an architecture does not support guest debug or breakpoints, the callbacks are simply NULL and common code handles this gracefully. As a result we can drop TARGET_KVM_HAVE_GUEST_DEBUG. Remove it from target configs and eliminate the #ifdef guards. Signed-off-by: Alex Bennée --- 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 | 15 +++++---------- 12 files changed, 5 insertions(+), 31 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 a425b3dbaae..3b3a9021980 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 a10dc03c04c..18b674230ab 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 478988e6d4a..6a629c6479e 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 cfc0144d9a5..1a52e7e5261 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -232,14 +232,7 @@ void kvm_irqchip_change_notify(void); * calling down to the KVMCPUOps::update_guest_debug callback 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 445d7d7f545..ab10de6ac30 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -86,12 +86,10 @@ static bool kvm_cpus_are_resettable(void) return !kvm_enabled() || !kvm_state->guest_state_protected; } -#ifdef TARGET_KVM_HAVE_GUEST_DEBUG static void kvm_update_guest_debug_ops(CPUState *cpu) { kvm_update_guest_debug(cpu, 0); } -#endif static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) { @@ -106,12 +104,10 @@ 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->insert_gdbstub_breakpoint = kvm_insert_gdbstub_breakpoint; ops->remove_gdbstub_breakpoint = kvm_remove_gdbstub_breakpoint; ops->remove_all_gdbstub_breakpoints = kvm_remove_all_gdbstub_breakpoints; -#endif } static const TypeInfo kvm_accel_ops_type = { diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 3bd61264a7e..5b96fac513e 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2964,9 +2964,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) { @@ -3077,7 +3075,6 @@ 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 if (kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG) > 0) { as->gdbstub.sstep_flags = SSTEP_ENABLE; @@ -3088,7 +3085,6 @@ static int kvm_init(AccelState *as, MachineState *ms) as->gdbstub.sstep_flags |= SSTEP_NOIRQ; } } -#endif kvm_state = s; @@ -3832,7 +3828,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; @@ -3869,6 +3864,10 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) const KVMCPUOps *ops = kvm_get_cpu_ops(cpu); struct kvm_set_guest_debug_data data; + if (!ops || !ops->update_guest_debug) { + return -EINVAL; + } + data.dbg.control = reinject_trap; if (cpu_single_stepping(cpu)) { @@ -3878,9 +3877,7 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) data.dbg.control |= KVM_GUESTDBG_BLOCKIRQ; } } - if (ops && ops->update_guest_debug) { - ops->update_guest_debug(cpu, &data.dbg); - } + ops->update_guest_debug(cpu, &data.dbg); run_on_cpu(cpu, kvm_invoke_set_guest_debug, RUN_ON_CPU_HOST_PTR(&data)); @@ -4022,8 +4019,6 @@ void kvm_remove_all_gdbstub_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; -- 2.47.3