hw-breakpoints: Wrap in the KVM breakpoint active state check

Wrap in the cpu dr7 check that tells if we have active
breakpoints that need to be restored in the cpu.

This wrapper makes the check more self-explainable and also
reusable for any further other uses.

Reported-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: "K. Prasad" <prasad@linux.vnet.ibm.com>

diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h
index f1b673f0823984134fde2ecb59d8fefa1edab2bc..0f6e92af4227c536d412b7b955b584cbaff56a52 100644 (file)
--- a/arch/x86/include/asm/debugreg.h
+++ b/arch/x86/include/asm/debugreg.h
@@ -89,6 +89,11 @@ static inline void hw_breakpoint_disable(void)
        set_debugreg(0UL, 3);
 }
 
+static inline int hw_breakpoint_active(void)
+{
+       return __get_cpu_var(dr7) & DR_GLOBAL_ENABLE_MASK;
+}
+
 extern void aout_dump_debugregs(struct user *dump);
 
 #ifdef CONFIG_KVM

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 22dee7aa7813973e895595ebbc879a1a5e87685f..3817220cc86b505b10ce28b7787d07a908df3285 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3651,7 +3651,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         * care about the messed up debug address registers. But if
         * we have some of them active, restore the old state.
         */
-       if (__get_cpu_var(dr7) & DR_GLOBAL_ENABLE_MASK)
+       if (hw_breakpoint_active())
                hw_breakpoint_restore();
 
        set_bit(KVM_REQ_KICK, &vcpu->requests);