summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorPaolo Bonzini2014-02-21 09:55:56 +0100
committerPaolo Bonzini2014-03-11 10:46:02 +0100
commit360b948d88bf30ef4b10b693adf497f51fb46a08 (patch)
treee79afd2bdca00c83a32e40bd771ad66756bcc787 /arch/x86/kvm/x86.c
parentKVM: vmx: we do rely on loading DR7 on entry (diff)
downloadkernel-qcow2-linux-360b948d88bf30ef4b10b693adf497f51fb46a08.tar.gz
kernel-qcow2-linux-360b948d88bf30ef4b10b693adf497f51fb46a08.tar.xz
kernel-qcow2-linux-360b948d88bf30ef4b10b693adf497f51fb46a08.zip
KVM: x86: change vcpu->arch.switch_db_regs to a bit mask
The next patch will add another bit that we can test with the same "if". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 622312176f28..85c74e7df2df 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -759,7 +759,9 @@ static void kvm_update_dr7(struct kvm_vcpu *vcpu)
else
dr7 = vcpu->arch.dr7;
kvm_x86_ops->set_dr7(vcpu, dr7);
- vcpu->arch.switch_db_regs = (dr7 & DR7_BP_EN_MASK);
+ vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_BP_ENABLED;
+ if (dr7 & DR7_BP_EN_MASK)
+ vcpu->arch.switch_db_regs |= KVM_DEBUGREG_BP_ENABLED;
}
static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val)