diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2009-03-04 13:33:02 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-10 11:48:26 +0300 |
| commit | 74a3a8f152053394a016518cc2f2fee216897fa4 (patch) | |
| tree | 96e2d2a9a8583836280063fde54323715ff8d90a /virt/kvm/ioapic.h | |
| parent | 3f5e06f8799adca3e7e1bbafe1cd780a3e69f604 (diff) | |
| download | blackbird-op-linux-74a3a8f152053394a016518cc2f2fee216897fa4.tar.gz blackbird-op-linux-74a3a8f152053394a016518cc2f2fee216897fa4.zip | |
KVM: Merge kvm_ioapic_get_delivery_bitmask into kvm_get_intr_delivery_bitmask
Gleb fixed bitmap ops usage in kvm_ioapic_get_delivery_bitmask.
Sheng merged two functions, as well as fixed several issues in
kvm_get_intr_delivery_bitmask
1. deliver_bitmask is a bitmap rather than a unsigned long intereger.
2. Lowest priority target bitmap wrong calculated by mistake.
3. Prevent potential NULL reference.
4. Declaration in include/kvm_host.h caused powerpc compilation warning.
5. Add warning for guest broadcast interrupt with lowest priority delivery mode.
6. Removed duplicate bitmap clean up in caller of kvm_get_intr_delivery_bitmask.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt/kvm/ioapic.h')
| -rw-r--r-- | virt/kvm/ioapic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index 7275f87a11cd..c8032ab2a4e2 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -70,7 +70,8 @@ void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode); int kvm_ioapic_init(struct kvm *kvm); int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level); void kvm_ioapic_reset(struct kvm_ioapic *ioapic); -void kvm_ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest, - u8 dest_mode, unsigned long *mask); +void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic, + union kvm_ioapic_redirect_entry *entry, + unsigned long *deliver_bitmask); #endif |
