KVM: Remove internal timer abstraction

[deliverable/linux.git] / arch / x86 / kvm / lapic.h

diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 4af5405ae1e2f4e2822cde6bd844e73f0489e850..d7251c92ed426ef96cb48a74edc958cf45fe69ee 100644 (file)
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -2,10 +2,25 @@
 #define __KVM_X86_LAPIC_H
 
 #include "iodev.h"
-#include "kvm_timer.h"
 
 #include <linux/kvm_host.h>
 
+struct kvm_timer {
+       struct hrtimer timer;
+       s64 period;                             /* unit: ns */
+       u32 timer_mode_mask;
+       u64 tscdeadline;
+       atomic_t pending;                       /* accumulated triggered timers */
+       bool reinject;
+       struct kvm_timer_ops *t_ops;
+       struct kvm *kvm;
+       struct kvm_vcpu *vcpu;
+};
+
+struct kvm_timer_ops {
+       bool (*is_periodic)(struct kvm_timer *);
+};
+
 struct kvm_lapic {
        unsigned long base_address;
        struct kvm_io_device dev;