1 files changed, 9 insertions, 6 deletions

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 49205d01b9ad..572460175ba5 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -152,14 +152,16 @@ enum {
 
 #define DR6_BD          (1 << 13)
 #define DR6_BS          (1 << 14)
-#define DR6_FIXED_1     0xffff0ff0
-#define DR6_VOLATILE    0x0000e00f
+#define DR6_RTM         (1 << 16)
+#define DR6_FIXED_1     0xfffe0ff0
+#define DR6_INIT        0xffff0ff0
+#define DR6_VOLATILE    0x0001e00f
 
 #define DR7_BP_EN_MASK  0x000000ff
 #define DR7_GE          (1 << 9)
 #define DR7_GD          (1 << 13)
 #define DR7_FIXED_1     0x00000400
-#define DR7_VOLATILE    0xffff23ff
+#define DR7_VOLATILE    0xffff2bff
 
 /* apic attention bits */
 #define KVM_APIC_CHECK_VAPIC    0
@@ -448,7 +450,7 @@ struct kvm_vcpu_arch {
         u64 tsc_offset_adjustment;
         u64 this_tsc_nsec;
         u64 this_tsc_write;
-        u8  this_tsc_generation;
+        u64 this_tsc_generation;
         bool tsc_catchup;
         bool tsc_always_catchup;
         s8 virtual_tsc_shift;
@@ -591,7 +593,7 @@ struct kvm_arch {
         u64 cur_tsc_nsec;
         u64 cur_tsc_write;
         u64 cur_tsc_offset;
-        u8  cur_tsc_generation;
+        u64 cur_tsc_generation;
         int nr_vcpus_matched_tsc;
 
         spinlock_t pvclock_gtod_sync_lock;
@@ -717,7 +719,7 @@ struct kvm_x86_ops {
         int (*handle_exit)(struct kvm_vcpu *vcpu);
         void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu);
         void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu, int mask);
-        u32 (*get_interrupt_shadow)(struct kvm_vcpu *vcpu, int mask);
+        u32 (*get_interrupt_shadow)(struct kvm_vcpu *vcpu);
         void (*patch_hypercall)(struct kvm_vcpu *vcpu,
                                 unsigned char *hypercall_addr);
         void (*set_irq)(struct kvm_vcpu *vcpu);
@@ -1070,6 +1072,7 @@ void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu);
 bool kvm_pmu_msr(struct kvm_vcpu *vcpu, u32 msr);
 int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *data);
 int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info);
+int kvm_pmu_check_pmc(struct kvm_vcpu *vcpu, unsigned pmc);
 int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data);
 void kvm_handle_pmu_event(struct kvm_vcpu *vcpu);
 void kvm_deliver_pmi(struct kvm_vcpu *vcpu);