Re: [PATCH 06/21] target/arm/kvm: Move kvm_arm_hw_debug_active and unexport

[Gavin Shan]

On 11/23/23 15:42, Richard Henderson wrote:

Signed-off-by: Richard Henderson 
---
  target/arm/kvm_arm.h |  8 
  target/arm/kvm.c | 11 +++
  target/arm/kvm64.c   |  5 -
  3 files changed, 11 insertions(+), 13 deletions(-)



Reviewed-by: Gavin Shan 

Re: [PATCH 06/21] target/arm/kvm: Move kvm_arm_hw_debug_active and unexport

[Philippe Mathieu-Daudé]

On 23/11/23 05:42, Richard Henderson wrote:

Signed-off-by: Richard Henderson 
---
  target/arm/kvm_arm.h |  8 
  target/arm/kvm.c | 11 +++
  target/arm/kvm64.c   |  5 -
  3 files changed, 11 insertions(+), 13 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

[PATCH 06/21] target/arm/kvm: Move kvm_arm_hw_debug_active and unexport

[Richard Henderson]

Signed-off-by: Richard Henderson 
---
 target/arm/kvm_arm.h |  8 
 target/arm/kvm.c | 11 +++
 target/arm/kvm64.c   |  5 -
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h
index 207b7f21b0..ac4856cb46 100644
--- a/target/arm/kvm_arm.h
+++ b/target/arm/kvm_arm.h
@@ -454,12 +454,4 @@ static inline uint32_t kvm_arm_sve_get_vls(CPUState *cs)
  */
 bool kvm_arm_handle_debug(CPUState *cs, struct kvm_debug_exit_arch 
*debug_exit);
 
-/**
- * kvm_arm_hw_debug_active:
- * @cs: CPU State
- *
- * Return: TRUE if any hardware breakpoints in use.
- */
-bool kvm_arm_hw_debug_active(CPUState *cs);
-
 #endif
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 2898e680fc..4608bea7df 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -1021,6 +1021,17 @@ int kvm_arch_process_async_events(CPUState *cs)
 return 0;
 }
 
+/**
+ * kvm_arm_hw_debug_active:
+ * @cs: CPU State
+ *
+ * Return: TRUE if any hardware breakpoints in use.
+ */
+static bool kvm_arm_hw_debug_active(CPUState *cs)
+{
+return ((cur_hw_wps > 0) || (cur_hw_bps > 0));
+}
+
 /**
  * kvm_arm_copy_hw_debug_data:
  * @ptr: kvm_guest_debug_arch structure
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index ac3120adaf..352643e066 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -73,11 +73,6 @@ void kvm_arch_remove_all_hw_breakpoints(void)
 }
 }
 
-bool kvm_arm_hw_debug_active(CPUState *cs)
-{
-return ((cur_hw_wps > 0) || (cur_hw_bps > 0));
-}
-
 static bool kvm_arm_set_device_attr(CPUState *cs, struct kvm_device_attr *attr,
 const char *name)
 {
-- 
2.34.1