OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm/kvm: Merge kvm_arm_init_debug into kvm_arch_init

Browse Source 
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>
This commit is contained in:
Richard Henderson 2023-12-19 17:57:39 +00:00 committed by Peter Maydell
parent b16620c32c
commit dd2157d291
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/arm/kvm.c
View File

@ -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; return ret;
} }

12
target/arm/kvm64.c
View File

@ -33,18 +33,6 @@
#include "hw/acpi/ghes.h" #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) int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)
{ {
switch (type) { switch (type) {

8
target/arm/kvm_arm.h
View File

@ -18,14 +18,6 @@
#define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V2 (1 << 0)
#define KVM_ARM_VGIC_V3 (1 << 1) #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: * kvm_arm_vcpu_init:
* @cs: CPUState * @cs: CPUState