Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0eb196 authored by Avi Kivity's avatar Avi Kivity
Browse files

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: default avatarAvi Kivity <avi@redhat.com>
parent d39123a4

arch/ia64/include/asm/kvm.h

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 


#include <linux/ioctl.h>



/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_DEVICE_ASSIGNMENT



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256

arch/x86/include/asm/kvm.h

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
#include <linux/types.h>

#include <linux/ioctl.h>



/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_PIT

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_DEVICE_ASSIGNMENT

#define __KVM_HAVE_MSI

#define __KVM_HAVE_USER_NMI



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256

include/linux/kvm.h

+5 −5
Original line number Diff line number Diff line
@@ -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