From 0f103c77bbb467dc89a039ad6ddc6ac1452aba88 Mon Sep 17 00:00:00 2001 From: Qing He Date: Mon, 24 Sep 2007 17:39:41 +0800 Subject: [PATCH] --- yaml --- r: 80660 b: refs/heads/master c: e4d47f404b59adf22f639fedc943db99f090f9ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/lapic.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2b355ff3cea2..469a827deaec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 313a3dc75da20630e549441932a7654223f8d72a +refs/heads/master: e4d47f404b59adf22f639fedc943db99f090f9ee diff --git a/trunk/drivers/kvm/lapic.c b/trunk/drivers/kvm/lapic.c index e15b42e48862..8840f9dc0bca 100644 --- a/trunk/drivers/kvm/lapic.c +++ b/trunk/drivers/kvm/lapic.c @@ -395,10 +395,9 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector, unsigned long bitmap) { - int vcpu_id; int last; int next; - struct kvm_lapic *apic; + struct kvm_lapic *apic = NULL; last = kvm->round_robin_prev_vcpu; next = last; @@ -415,14 +414,8 @@ struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector, } while (next != last); kvm->round_robin_prev_vcpu = next; - if (!apic) { - vcpu_id = ffs(bitmap) - 1; - if (vcpu_id < 0) { - vcpu_id = 0; - printk(KERN_DEBUG "vcpu not ready for apic_round_robin\n"); - } - apic = kvm->vcpus[vcpu_id]->apic; - } + if (!apic) + printk(KERN_DEBUG "vcpu not ready for apic_round_robin\n"); return apic; }