diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-08-29 12:08:22 +0200 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-08-30 15:03:07 +0200 |
| commit | 986af8e0789a41ac4844e6eefed4a33e86524918 (patch) | |
| tree | 1f4471fa52051d9fce4077c53bbc25ad0debda62 /virt/kvm | |
| parent | Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into queue (diff) | |
| download | linux-986af8e0789a41ac4844e6eefed4a33e86524918.tar.xz linux-986af8e0789a41ac4844e6eefed4a33e86524918.zip | |
ARM: KVM: vgic: simplify vgic_get_target_reg
vgic_get_target_reg is quite complicated, for no good reason.
Actually, it is fairly easy to write it in a much more efficient
way by using the target CPU array instead of the bitmap.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/arm/vgic.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 17c5ac7d10ed..a2d478aec046 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -432,19 +432,13 @@ static bool handle_mmio_priority_reg(struct kvm_vcpu *vcpu, static u32 vgic_get_target_reg(struct kvm *kvm, int irq) { struct vgic_dist *dist = &kvm->arch.vgic; - struct kvm_vcpu *vcpu; - int i, c; - unsigned long *bmap; + int i; u32 val = 0; irq -= VGIC_NR_PRIVATE_IRQS; - kvm_for_each_vcpu(c, vcpu, kvm) { - bmap = vgic_bitmap_get_shared_map(&dist->irq_spi_target[c]); - for (i = 0; i < GICD_IRQS_PER_ITARGETSR; i++) - if (test_bit(irq + i, bmap)) - val |= 1 << (c + i * 8); - } + for (i = 0; i < GICD_IRQS_PER_ITARGETSR; i++) + val |= 1 << (dist->irq_spi_cpu[irq + i] + i * 8); return val; } |