Commit 244d57ec authored by Jerone Young's avatar Jerone Young Committed by Avi Kivity
Browse files

KVM: Portability: Move kvm_sregs and msr structures to <asm/kvm.h> 



Move structures:
	kvm_sregs
	kvm_msr_entry
	kvm_msrs
	kvm_msr_list

from include/linux/kvm.h to include/asm-x86/kvm.h

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 3a56b201

include/asm-x86/kvm.h

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

#include <linux/ioctl.h>



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256



struct kvm_memory_alias {

	__u32 slot;  /* this has a different namespace than memory slots */

	__u32 flags;
@@ -99,4 +102,37 @@ struct kvm_dtable { 
};





/* for KVM_GET_SREGS and KVM_SET_SREGS */

struct kvm_sregs {

	/* out (KVM_GET_SREGS) / in (KVM_SET_SREGS) */

	struct kvm_segment cs, ds, es, fs, gs, ss;

	struct kvm_segment tr, ldt;

	struct kvm_dtable gdt, idt;

	__u64 cr0, cr2, cr3, cr4, cr8;

	__u64 efer;

	__u64 apic_base;

	__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];

};



struct kvm_msr_entry {

	__u32 index;

	__u32 reserved;

	__u64 data;

};



/* for KVM_GET_MSRS and KVM_SET_MSRS */

struct kvm_msrs {

	__u32 nmsrs; /* number of msrs in entries */

	__u32 pad;



	struct kvm_msr_entry entries[0];

};



/* for KVM_GET_MSR_INDEX_LIST */

struct kvm_msr_list {

	__u32 nmsrs; /* number of msrs in entries */

	__u32 indices[0];

};





#endif

include/linux/kvm.h

+0 −36
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 


#define KVM_API_VERSION 12



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256



/* for KVM_CREATE_MEMORY_REGION */

struct kvm_memory_region {

	__u32 slot;
@@ -151,39 +148,6 @@ struct kvm_fpu { 
};







/* for KVM_GET_SREGS and KVM_SET_SREGS */

struct kvm_sregs {

	/* out (KVM_GET_SREGS) / in (KVM_SET_SREGS) */

	struct kvm_segment cs, ds, es, fs, gs, ss;

	struct kvm_segment tr, ldt;

	struct kvm_dtable gdt, idt;

	__u64 cr0, cr2, cr3, cr4, cr8;

	__u64 efer;

	__u64 apic_base;

	__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];

};



struct kvm_msr_entry {

	__u32 index;

	__u32 reserved;

	__u64 data;

};



/* for KVM_GET_MSRS and KVM_SET_MSRS */

struct kvm_msrs {

	__u32 nmsrs; /* number of msrs in entries */

	__u32 pad;



	struct kvm_msr_entry entries[0];

};



/* for KVM_GET_MSR_INDEX_LIST */

struct kvm_msr_list {

	__u32 nmsrs; /* number of msrs in entries */

	__u32 indices[0];

};



/* for KVM_TRANSLATE */

struct kvm_translation {

	/* in */