summaryrefslogtreecommitdiff
path: root/arch/x86/kvm/i8254.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-07-26 19:01:53 +0400
committerMarcelo Tosatti <mtosatti@redhat.com>2012-08-01 07:21:07 +0400
commit26ef19242f6e4d747a61b5fd8da72343838864e4 (patch)
treef2eedd1c60bbd34f72c6a1546958cb8bec0c573d /arch/x86/kvm/i8254.h
parent9d9d2239bdecd525ce3eb6cbfe4abb925c98208c (diff)
downloadlinux-26ef19242f6e4d747a61b5fd8da72343838864e4.tar.xz
KVM: fold kvm_pit_timer into kvm_kpit_state
One structure nests inside the other, providing no value at all. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/i8254.h')
-rw-r--r--arch/x86/kvm/i8254.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index c9bbcb889c40..dd1b16b611b0 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -21,19 +21,15 @@ struct kvm_kpit_channel_state {
ktime_t count_load_time;
};
-struct kvm_pit_timer {
- struct hrtimer timer;
- s64 period; /* unit: ns */
- atomic_t pending; /* accumulated triggered timers */
- bool reinject;
- struct kvm *kvm;
-};
-
struct kvm_kpit_state {
struct kvm_kpit_channel_state channels[3];
u32 flags;
- struct kvm_pit_timer pit_timer;
bool is_periodic;
+ s64 period; /* unit: ns */
+ struct hrtimer timer;
+ atomic_t pending; /* accumulated triggered timers */
+ bool reinject;
+ struct kvm *kvm;
u32 speaker_data_on;
struct mutex lock;
struct kvm_pit *pit;