Commit a50abc3b authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Avi Kivity
Browse files

KVM: use symbolic constant for nr interrupts 



interrupt_bitmap is KVM_NR_INTERRUPTS bits in size,
so just use that instead of hard-coded constants
and math.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b3356bf0

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2366,7 +2366,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu, 
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,

				    struct kvm_interrupt *irq)

{

	if (irq->irq < 0 || irq->irq >= 256)

	if (irq->irq < 0 || irq->irq >= KVM_NR_INTERRUPTS)

		return -EINVAL;

	if (irqchip_in_kernel(vcpu->kvm))

		return -ENXIO;
@@ -5793,7 +5793,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	if (mmu_reset_needed)

		kvm_mmu_reset_context(vcpu);



	max_bits = (sizeof sregs->interrupt_bitmap) << 3;

	max_bits = KVM_NR_INTERRUPTS;

	pending_vec = find_first_bit(

		(const unsigned long *)sregs->interrupt_bitmap, max_bits);

	if (pending_vec < max_bits) {