kvm isn't ever used and pit can be accessed with container_of.
If you *really* need kvm, pit_state_to_pit(ps)->kvm.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+static inline struct kvm_pit *pit_state_to_pit(struct kvm_kpit_state *ps)
+{
+ return container_of(ps, struct kvm_pit, pit_state);
+}
+
static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)
{
struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state,
irq_ack_notifier);
static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)
{
struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state,
irq_ack_notifier);
+ struct kvm_pit *pit = pit_state_to_pit(ps);
atomic_set(&ps->irq_ack, 1);
/* irq_ack should be set before pending is read. Order accesses with
atomic_set(&ps->irq_ack, 1);
/* irq_ack should be set before pending is read. Order accesses with
*/
smp_mb();
if (atomic_dec_if_positive(&ps->pending) > 0)
*/
smp_mb();
if (atomic_dec_if_positive(&ps->pending) > 0)
- queue_kthread_work(&ps->pit->worker, &ps->pit->expired);
+ queue_kthread_work(&pit->worker, &pit->expired);
}
void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)
}
void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)
static enum hrtimer_restart pit_timer_fn(struct hrtimer *data)
{
struct kvm_kpit_state *ps = container_of(data, struct kvm_kpit_state, timer);
static enum hrtimer_restart pit_timer_fn(struct hrtimer *data)
{
struct kvm_kpit_state *ps = container_of(data, struct kvm_kpit_state, timer);
- struct kvm_pit *pt = ps->kvm->arch.vpit;
+ struct kvm_pit *pt = pit_state_to_pit(ps);
if (ps->reinject)
atomic_inc(&ps->pending);
if (ps->reinject)
atomic_inc(&ps->pending);
/* TODO The new value only affected after the retriggered */
hrtimer_cancel(&ps->timer);
/* TODO The new value only affected after the retriggered */
hrtimer_cancel(&ps->timer);
- flush_kthread_work(&ps->pit->expired);
+ flush_kthread_work(&pit->expired);
ps->period = interval;
ps->is_periodic = is_period;
ps->timer.function = pit_timer_fn;
ps->period = interval;
ps->is_periodic = is_period;
ps->timer.function = pit_timer_fn;
kvm_pit_reset_reinject(pit);
kvm_pit_reset_reinject(pit);
pit->kvm = kvm;
pit_state = &pit->pit_state;
pit->kvm = kvm;
pit_state = &pit->pit_state;
hrtimer_init(&pit_state->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
pit_state->irq_ack_notifier.gsi = 0;
hrtimer_init(&pit_state->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
pit_state->irq_ack_notifier.gsi = 0;
u32 speaker_data_on;
struct mutex lock;
u32 speaker_data_on;
struct mutex lock;
- struct kvm *kvm;
- struct kvm_pit *pit;
bool reinject;
atomic_t pending; /* accumulated triggered timers */
atomic_t irq_ack;
bool reinject;
atomic_t pending; /* accumulated triggered timers */
atomic_t irq_ack;