diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-12-19 17:57:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-12-19 17:57:39 +0000 |
| commit | dd2157d29114f9ad8d0deda155131900e9d6aa99 (patch) | |
| tree | 20887b6b674df8a73b1853d3cf1320b55c0a0bd7 | |
| parent | b16620c32cfdfba40d8f6e515fc9c19d12a17ef0 (diff) | |
| download | qemu-dd2157d29114f9ad8d0deda155131900e9d6aa99.zip qemu-dd2157d29114f9ad8d0deda155131900e9d6aa99.tar.gz qemu-dd2157d29114f9ad8d0deda155131900e9d6aa99.tar.bz2 | |
target/arm/kvm: Merge kvm_arm_init_debug into kvm_arch_init
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/kvm.c | 8 | ||||
| -rw-r--r-- | target/arm/kvm64.c | 12 | ||||
| -rw-r--r-- | target/arm/kvm_arm.h | 8 |
3 files changed, 7 insertions, 21 deletions
diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 7903e2d..b4836da 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -308,7 +308,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } } - kvm_arm_init_debug(s); + 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); + + max_hw_bps = kvm_check_extension(s, KVM_CAP_GUEST_DEBUG_HW_BPS); + hw_breakpoints = g_array_sized_new(true, true, + sizeof(HWBreakpoint), max_hw_bps); return ret; } diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index b8bb25a..40f459b 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -33,18 +33,6 @@ #include "hw/acpi/ghes.h" -void kvm_arm_init_debug(KVMState *s) -{ - 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); - - max_hw_bps = kvm_check_extension(s, KVM_CAP_GUEST_DEBUG_HW_BPS); - hw_breakpoints = g_array_sized_new(true, true, - sizeof(HWBreakpoint), max_hw_bps); - return; -} - int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type) { switch (type) { diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 051a0da..fe6d824 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -19,14 +19,6 @@ #define KVM_ARM_VGIC_V3 (1 << 1) /** - * kvm_arm_init_debug() - initialize guest debug capabilities - * @s: KVMState - * - * Should be called only once before using guest debug capabilities. - */ -void kvm_arm_init_debug(KVMState *s); - -/** * kvm_arm_vcpu_init: * @cs: CPUState * |