diff options
| author |   Qing He <qing.he@intel.com> | 2007-09-24 17:39:41 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-01-30 17:52:52 +0200 |
| commit | e4d47f404b59adf22f639fedc943db99f090f9ee (patch) | |
| tree | f9a4912f78242055d7a40f18f0f4887db36619fe | |
| parent | KVM: Portability: split kvm_vcpu_ioctl (diff) | |
| download | linux-dev-e4d47f404b59adf22f639fedc943db99f090f9ee.tar.xz linux-dev-e4d47f404b59adf22f639fedc943db99f090f9ee.zip | |
KVM: apic round robin cleanup
If no apic is enabled in the bitmap of an interrupt delivery with delivery
mode of lowest priority, a warning should be reported rather than select
a fallback vcpu
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Eddie (Yaozu) Dong <eddie.dong@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/lapic.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/kvm/lapic.c b/drivers/kvm/lapic.c index e15b42e48862..8840f9dc0bca 100644 --- a/drivers/kvm/lapic.c +++ b/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; } |