diff options
| author | Avi Kivity | 2009-01-19 13:57:52 +0100 |
|---|---|---|
| committer | Avi Kivity | 2009-03-24 10:03:06 +0100 |
| commit | 91b2ae773d3b168b763237fac33f75b13d891f20 (patch) | |
| tree | 739ec0a4debd058277493707c8ebf6226dbe41a3 | |
| parent | KVM: Userspace controlled irq routing (diff) | |
| download | kernel-qcow2-linux-91b2ae773d3b168b763237fac33f75b13d891f20.tar.gz kernel-qcow2-linux-91b2ae773d3b168b763237fac33f75b13d891f20.tar.xz kernel-qcow2-linux-91b2ae773d3b168b763237fac33f75b13d891f20.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>
| -rw-r--r-- | arch/x86/include/asm/kvm.h | 1 | ||||
| -rw-r--r-- | include/linux/kvm.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index 54bcf2281526..dc3f6cf11704 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h @@ -15,6 +15,7 @@ #define __KVM_HAVE_DEVICE_ASSIGNMENT #define __KVM_HAVE_MSI #define __KVM_HAVE_USER_NMI +#define __KVM_HAVE_GUEST_DEBUG /* Architectural interrupt line count. */ #define KVM_NR_INTERRUPTS 256 diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 7a5d73a8d4fa..869462ca7625 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -393,13 +393,13 @@ struct kvm_trace_rec { #ifdef __KVM_HAVE_USER_NMI #define KVM_CAP_USER_NMI 22 #endif -#if defined(CONFIG_X86) +#ifdef __KVM_HAVE_GUEST_DEBUG #define KVM_CAP_SET_GUEST_DEBUG 23 #endif -#if defined(CONFIG_X86) +#ifdef __KVM_HAVE_PIT #define KVM_CAP_REINJECT_CONTROL 24 #endif -#if defined(CONFIG_X86)||defined(CONFIG_IA64) +#ifdef __KVM_HAVE_IOAPIC #define KVM_CAP_IRQ_ROUTING 25 #endif |