leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: Simplify kvm_timer

Browse Source 
'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>
This commit is contained in:
Avi Kivity
2012-07-26 18:01:51 +03:00
committed by Marcelo Tosatti
parent e9d90d472d
commit 2a6eac9638
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kvm/lapic.c
View File

@@ -1214,10 +1214,8 @@ int kvm_lapic_enabled(struct kvm_vcpu *vcpu)
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
static bool lapic_is_periodic(struct kvm_timer *ktimer) static bool lapic_is_periodic(struct kvm_lapic *apic)
{ {
struct kvm_lapic *apic = container_of(ktimer, struct kvm_lapic,
lapic_timer);
return apic_lvtt_period(apic); return apic_lvtt_period(apic);
} }
@@ -1253,10 +1251,6 @@ void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vcpu)
kvm_apic_local_deliver(apic, APIC_LVT0); kvm_apic_local_deliver(apic, APIC_LVT0);
} }
static struct kvm_timer_ops lapic_timer_ops = {
.is_periodic = lapic_is_periodic,
};
static const struct kvm_io_device_ops apic_mmio_ops = { static const struct kvm_io_device_ops apic_mmio_ops = {
.read = apic_mmio_read, .read = apic_mmio_read,
.write = apic_mmio_write, .write = apic_mmio_write,
@@ -1265,7 +1259,8 @@ static const struct kvm_io_device_ops apic_mmio_ops = {
static enum hrtimer_restart apic_timer_fn(struct hrtimer *data) static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
{ {
struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer); struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);
struct kvm_vcpu *vcpu = ktimer->vcpu; struct kvm_lapic *apic = container_of(ktimer, struct kvm_lapic, lapic_timer);
struct kvm_vcpu *vcpu = apic->vcpu;
wait_queue_head_t *q = &vcpu->wq; wait_queue_head_t *q = &vcpu->wq;
/* /*
@@ -1274,7 +1269,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
* case anyway. Note: KVM_REQ_PENDING_TIMER is implicitly checked * case anyway. Note: KVM_REQ_PENDING_TIMER is implicitly checked
* in vcpu_enter_guest. * in vcpu_enter_guest.
*/ */
if (ktimer->reinject || !atomic_read(&ktimer->pending)) { if (!atomic_read(&ktimer->pending)) {
atomic_inc(&ktimer->pending); atomic_inc(&ktimer->pending);
/* FIXME: this code should not know anything about vcpus */ /* FIXME: this code should not know anything about vcpus */
kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu); kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu);
@@ -1283,7 +1278,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
if (waitqueue_active(q)) if (waitqueue_active(q))
wake_up_interruptible(q); wake_up_interruptible(q);
if (ktimer->t_ops->is_periodic(ktimer)) { if (lapic_is_periodic(apic)) {
hrtimer_add_expires_ns(&ktimer->timer, ktimer->period); hrtimer_add_expires_ns(&ktimer->timer, ktimer->period);
return HRTIMER_RESTART; return HRTIMER_RESTART;
} else } else
@@ -1314,9 +1309,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
HRTIMER_MODE_ABS); HRTIMER_MODE_ABS);
apic->lapic_timer.timer.function = apic_timer_fn; apic->lapic_timer.timer.function = apic_timer_fn;
apic->lapic_timer.t_ops = &lapic_timer_ops;
apic->lapic_timer.kvm = vcpu->kvm;
apic->lapic_timer.vcpu = vcpu;
apic->base_address = APIC_DEFAULT_PHYS_BASE; apic->base_address = APIC_DEFAULT_PHYS_BASE;
vcpu->arch.apic_base = APIC_DEFAULT_PHYS_BASE; vcpu->arch.apic_base = APIC_DEFAULT_PHYS_BASE;

8
arch/x86/kvm/lapic.h
View File

@@ -11,14 +11,6 @@ struct kvm_timer {
u32 timer_mode_mask; u32 timer_mode_mask;
u64 tscdeadline; u64 tscdeadline;
atomic_t pending; /* accumulated triggered timers */ 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 { struct kvm_lapic {