KVM: bit ops for deliver_bitmap

It's also convenient when we extend KVM supported vcpu number in the future.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 6aa8d20f9eeb..afc59b2e7e02 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -483,9 +483,10 @@ static void apic_send_ipi(struct kvm_lapic *apic)
 
         struct kvm_vcpu *target;
         struct kvm_vcpu *vcpu;
-        unsigned long lpr_map = 0;
+        DECLARE_BITMAP(lpr_map, KVM_MAX_VCPUS);
         int i;
 
+        bitmap_zero(lpr_map, KVM_MAX_VCPUS);
         apic_debug("icr_high 0x%x, icr_low 0x%x, "
                    "short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, "
                    "dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x\n",
@@ -500,7 +501,7 @@ static void apic_send_ipi(struct kvm_lapic *apic)
                 if (vcpu->arch.apic &&
                     apic_match_dest(vcpu, apic, short_hand, dest, dest_mode)) {
                         if (delivery_mode == APIC_DM_LOWEST)
-                                set_bit(vcpu->vcpu_id, &lpr_map);
+                                __set_bit(vcpu->vcpu_id, lpr_map);
                         else
                                 __apic_accept_irq(vcpu->arch.apic, delivery_mode,
                                                   vector, level, trig_mode);
@@ -508,7 +509,7 @@ static void apic_send_ipi(struct kvm_lapic *apic)
         }
 
         if (delivery_mode == APIC_DM_LOWEST) {
-                target = kvm_get_lowest_prio_vcpu(vcpu->kvm, vector, &lpr_map);
+                target = kvm_get_lowest_prio_vcpu(vcpu->kvm, vector, lpr_map);
                 if (target != NULL)
                         __apic_accept_irq(target->arch.apic, delivery_mode,
                                           vector, level, trig_mode);