mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-11 01:00:57 +00:00
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>
This commit is contained in:
parent
c845f9c646
commit
360b948d88
2 changed files with 8 additions and 2 deletions
|
@ -337,6 +337,10 @@ struct kvm_pmu {
|
||||||
u64 reprogram_pmi;
|
u64 reprogram_pmi;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
KVM_DEBUGREG_BP_ENABLED = 1,
|
||||||
|
};
|
||||||
|
|
||||||
struct kvm_vcpu_arch {
|
struct kvm_vcpu_arch {
|
||||||
/*
|
/*
|
||||||
* rip and regs accesses must go through
|
* rip and regs accesses must go through
|
||||||
|
@ -463,7 +467,7 @@ struct kvm_vcpu_arch {
|
||||||
struct mtrr_state_type mtrr_state;
|
struct mtrr_state_type mtrr_state;
|
||||||
u32 pat;
|
u32 pat;
|
||||||
|
|
||||||
int switch_db_regs;
|
unsigned switch_db_regs;
|
||||||
unsigned long db[KVM_NR_DB_REGS];
|
unsigned long db[KVM_NR_DB_REGS];
|
||||||
unsigned long dr6;
|
unsigned long dr6;
|
||||||
unsigned long dr7;
|
unsigned long dr7;
|
||||||
|
|
|
@ -759,7 +759,9 @@ static void kvm_update_dr7(struct kvm_vcpu *vcpu)
|
||||||
else
|
else
|
||||||
dr7 = vcpu->arch.dr7;
|
dr7 = vcpu->arch.dr7;
|
||||||
kvm_x86_ops->set_dr7(vcpu, 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)
|
static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val)
|
||||||
|
|
Loading…
Add table
Reference in a new issue