redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Paolo Bonzini 2014-02-21 09:55:56 +01:00
parent c845f9c646
commit 360b948d88
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/kvm_host.h
View File

@ -337,6 +337,10 @@ struct kvm_pmu {
u64 reprogram_pmi;
};
enum {
KVM_DEBUGREG_BP_ENABLED = 1,
};
struct kvm_vcpu_arch {
/*
* rip and regs accesses must go through
@ -463,7 +467,7 @@ struct kvm_vcpu_arch {
struct mtrr_state_type mtrr_state;
u32 pat;
int switch_db_regs;
unsigned switch_db_regs;
unsigned long db[KVM_NR_DB_REGS];
unsigned long dr6;
unsigned long dr7;

4
arch/x86/kvm/x86.c
View File

@ -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)