KVM: Simplify kvm_timer

'reinject' is never initialized
't_ops' only serves as indirection to lapic_is_periodic; call that directly
   instead
'kvm' is never used
'vcpu' can be derived via container_of

Remove these fields.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 0 insertions, 8 deletions

diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index d7251c92ed4..166766fffd9 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -11,14 +11,6 @@ struct kvm_timer {
         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 {