diff options
| author | Avi Kivity <avi@redhat.com> | 2009-01-19 14:57:52 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-02-15 02:47:35 +0200 |
| commit | 7a0eb1960e8ddcb68ea631caf16815485af0e228 (patch) | |
| tree | 0614c3c2265ed02072a082dea68a86e31f71dd7f /include/linux | |
| parent | d39123a486524fed9b4e43e08a8757fd90a5859a (diff) | |
| download | blackbird-op-linux-7a0eb1960e8ddcb68ea631caf16815485af0e228.tar.gz blackbird-op-linux-7a0eb1960e8ddcb68ea631caf16815485af0e228.zip | |
KVM: Avoid using CONFIG_ in userspace visible headers
Kconfig symbols are not available in userspace, and are not stripped by
headers-install. Avoid their use by adding #defines in <asm/kvm.h> to
suit each architecture.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 5715f1907601..0424326f1679 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -58,10 +58,10 @@ struct kvm_irqchip { __u32 pad; union { char dummy[512]; /* reserving space */ -#ifdef CONFIG_X86 +#ifdef __KVM_HAVE_PIT struct kvm_pic_state pic; #endif -#if defined(CONFIG_X86) || defined(CONFIG_IA64) +#ifdef __KVM_HAVE_IOAPIC struct kvm_ioapic_state ioapic; #endif } chip; @@ -384,16 +384,16 @@ struct kvm_trace_rec { #define KVM_CAP_MP_STATE 14 #define KVM_CAP_COALESCED_MMIO 15 #define KVM_CAP_SYNC_MMU 16 /* Changes to host mmap are reflected in guest */ -#if defined(CONFIG_X86)||defined(CONFIG_IA64) +#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT #define KVM_CAP_DEVICE_ASSIGNMENT 17 #endif #define KVM_CAP_IOMMU 18 -#if defined(CONFIG_X86) +#ifdef __KVM_HAVE_MSI #define KVM_CAP_DEVICE_MSI 20 #endif /* Bug in KVM_SET_USER_MEMORY_REGION fixed: */ #define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21 -#if defined(CONFIG_X86) +#ifdef __KVM_HAVE_USER_NMI #define KVM_CAP_USER_NMI 22 #endif |
