AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: Move some x86 specific constants and structures to include/asm-x86

Browse Source 
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity 2008-03-21 12:38:23 +02:00
parent 947da53830
commit 69a9f69bb2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/asm-x86/kvm_host.h
View File

@ -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.

13
include/linux/kvm_host.h
View File

@ -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 :),