diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-07-17 23:05:58 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-10-13 04:18:18 -0400 |
commit | 9eb829ced8c6f2e43a3a644ddf1279ffeee38a33 (patch) | |
tree | ea8360405de41110dd0063a9838447c5a7ab2632 /include/linux | |
parent | 66aee91aaab8f998d28a61ed7733be17ad8e6d8f (diff) |
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: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/kvm.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 68ecced40119..8db01a91e1a7 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -12,14 +12,8 @@ | |||
12 | 12 | ||
13 | #define KVM_API_VERSION 12 | 13 | #define KVM_API_VERSION 12 |
14 | 14 | ||
15 | /* | 15 | /* Architectural interrupt line count. */ |
16 | * Architectural interrupt line count, and the size of the bitmap needed | ||
17 | * to hold them. | ||
18 | */ | ||
19 | #define KVM_NR_INTERRUPTS 256 | 16 | #define KVM_NR_INTERRUPTS 256 |
20 | #define KVM_IRQ_BITMAP_SIZE_BYTES ((KVM_NR_INTERRUPTS + 7) / 8) | ||
21 | #define KVM_IRQ_BITMAP_SIZE(type) (KVM_IRQ_BITMAP_SIZE_BYTES / sizeof(type)) | ||
22 | |||
23 | 17 | ||
24 | /* for KVM_CREATE_MEMORY_REGION */ | 18 | /* for KVM_CREATE_MEMORY_REGION */ |
25 | struct kvm_memory_region { | 19 | struct kvm_memory_region { |
@@ -165,7 +159,7 @@ struct kvm_sregs { | |||
165 | __u64 cr0, cr2, cr3, cr4, cr8; | 159 | __u64 cr0, cr2, cr3, cr4, cr8; |
166 | __u64 efer; | 160 | __u64 efer; |
167 | __u64 apic_base; | 161 | __u64 apic_base; |
168 | __u64 interrupt_bitmap[KVM_IRQ_BITMAP_SIZE(__u64)]; | 162 | __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64]; |
169 | }; | 163 | }; |
170 | 164 | ||
171 | struct kvm_msr_entry { | 165 | struct kvm_msr_entry { |