KVM: Move some x86 specific constants and structures to include/asm-x86 (69a9f69b) · Commits · e / devices / android_kernel_teracube_emerald

include/asm-x86/kvm_host.h

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,13 @@

	#include <asm/desc.h>		#include <asm/desc.h>

			#define KVM_MAX_VCPUS 16
			#define KVM_MEMORY_SLOTS 32
			/* memory slots that does not exposed to userspace */
			#define KVM_PRIVATE_MEM_SLOTS 4

			#define KVM_PIO_PAGE_OFFSET 1

	#define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT \| X86_CR3_PCD) - 1)		#define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT \| X86_CR3_PCD) - 1)
	#define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT \| X86_CR3_PCD))		#define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT \| X86_CR3_PCD))
	#define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS \| \		#define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS \| \
	@@ -114,6 +121,12 @@ enum {

	#define KVM_NR_MEM_OBJS 40		#define KVM_NR_MEM_OBJS 40

			struct kvm_guest_debug {
			int enabled;
			unsigned long bp[4];
			int singlestep;
			};

	/*		/*
	* We don't want allocation failures within the mmu code, so we preallocate		* We don't want allocation failures within the mmu code, so we preallocate
	* enough memory for a single page fault in a cache.		* enough memory for a single page fault in a cache.

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -24,13 +24,6 @@

	#include <asm/kvm_host.h>		#include <asm/kvm_host.h>

	#define KVM_MAX_VCPUS 16
	#define KVM_MEMORY_SLOTS 32
	/* memory slots that does not exposed to userspace */
	#define KVM_PRIVATE_MEM_SLOTS 4

	#define KVM_PIO_PAGE_OFFSET 1

	/*		/*
	* vcpu->requests bit members		* vcpu->requests bit members
	*/		*/
	@@ -43,12 +36,6 @@
	struct kvm_vcpu;		struct kvm_vcpu;
	extern struct kmem_cache *kvm_vcpu_cache;		extern struct kmem_cache *kvm_vcpu_cache;

	struct kvm_guest_debug {
	int enabled;
	unsigned long bp[4];
	int singlestep;
	};

	/*		/*
	* It would be nice to use something smarter than a linear search, TBD...		* It would be nice to use something smarter than a linear search, TBD...
	* Thankfully we dont expect many devices to register (famous last words :),		* Thankfully we dont expect many devices to register (famous last words :),