Commit 9eb829ce authored by Rusty Russell's avatar Rusty Russell Committed by Avi Kivity

KVM: Trivial: Use standard BITMAP macros, open-code userspace-exposed header

Creating one's own BITMAP macro seems suboptimal: if we use manual
arithmetic in the one place exposed to userspace, we can use standard
macros elsewhere.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 66aee91a
...@@ -324,8 +324,7 @@ struct kvm_vcpu { ...@@ -324,8 +324,7 @@ struct kvm_vcpu {
int guest_mode; int guest_mode;
unsigned long requests; unsigned long requests;
unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */ unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */
#define NR_IRQ_WORDS KVM_IRQ_BITMAP_SIZE(unsigned long) DECLARE_BITMAP(irq_pending, KVM_NR_INTERRUPTS);
unsigned long irq_pending[NR_IRQ_WORDS];
unsigned long regs[NR_VCPU_REGS]; /* for rsp: vcpu_load_rsp_rip() */ unsigned long regs[NR_VCPU_REGS]; /* for rsp: vcpu_load_rsp_rip() */
unsigned long rip; /* needs vcpu_load_rsp_rip() */ unsigned long rip; /* needs vcpu_load_rsp_rip() */
......
...@@ -2130,7 +2130,7 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, ...@@ -2130,7 +2130,7 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
memcpy(vcpu->irq_pending, sregs->interrupt_bitmap, memcpy(vcpu->irq_pending, sregs->interrupt_bitmap,
sizeof vcpu->irq_pending); sizeof vcpu->irq_pending);
vcpu->irq_summary = 0; vcpu->irq_summary = 0;
for (i = 0; i < NR_IRQ_WORDS; ++i) for (i = 0; i < ARRAY_SIZE(vcpu->irq_pending); ++i)
if (vcpu->irq_pending[i]) if (vcpu->irq_pending[i])
__set_bit(i, &vcpu->irq_summary); __set_bit(i, &vcpu->irq_summary);
......
...@@ -12,14 +12,8 @@ ...@@ -12,14 +12,8 @@
#define KVM_API_VERSION 12 #define KVM_API_VERSION 12
/* /* Architectural interrupt line count. */
* Architectural interrupt line count, and the size of the bitmap needed
* to hold them.
*/
#define KVM_NR_INTERRUPTS 256 #define KVM_NR_INTERRUPTS 256
#define KVM_IRQ_BITMAP_SIZE_BYTES ((KVM_NR_INTERRUPTS + 7) / 8)
#define KVM_IRQ_BITMAP_SIZE(type) (KVM_IRQ_BITMAP_SIZE_BYTES / sizeof(type))
/* for KVM_CREATE_MEMORY_REGION */ /* for KVM_CREATE_MEMORY_REGION */
struct kvm_memory_region { struct kvm_memory_region {
...@@ -165,7 +159,7 @@ struct kvm_sregs { ...@@ -165,7 +159,7 @@ struct kvm_sregs {
__u64 cr0, cr2, cr3, cr4, cr8; __u64 cr0, cr2, cr3, cr4, cr8;
__u64 efer; __u64 efer;
__u64 apic_base; __u64 apic_base;
__u64 interrupt_bitmap[KVM_IRQ_BITMAP_SIZE(__u64)]; __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];
}; };
struct kvm_msr_entry { struct kvm_msr_entry {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment