Re: [PATCH] kvm/x86: use symbolic constant for nr interrupts

2012-09-06 Thread Avi Kivity
On 09/05/2012 08:00 PM, Michael S. Tsirkin wrote:
 interrupt_bitmap is KVM_NR_INTERRUPTS bits in size,
 so just use that instead of hard-coded constants
 and math.

Applied, thanks.


-- 
error compiling committee.c: too many arguments to function
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] kvm/x86: use symbolic constant for nr interrupts

2012-09-05 Thread Michael S. Tsirkin
interrupt_bitmap is KVM_NR_INTERRUPTS bits in size,
so just use that instead of hard-coded constants
and math.

Signed-off-by: Michael S. Tsirkin m...@redhat.com
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index dce75b76..62bba66 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2365,7 +2365,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;
@@ -5789,7 +5789,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) {
-- 
MST
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html