diff options
| author | Jerone Young <jyoung5@us.ibm.com> | 2007-11-20 00:06:31 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 16:53:07 +0100 |
| commit | f6a40e3bdf5fe0a7d7d7f2dbc5b10158fbdad968 (patch) | |
| tree | 79dbcdf9cefcfa3757a94bd8f129968e2cc423a0 /include | |
| parent | KVM: Move misplaced comment (diff) | |
| download | linux-f6a40e3bdf5fe0a7d7d7f2dbc5b10158fbdad968.tar.xz linux-f6a40e3bdf5fe0a7d7d7f2dbc5b10158fbdad968.zip | |
KVM: Portability: Move kvm_memory_alias to asm/kvm.h
This patch moves sturct kvm_memory_alias from include/linux/kvm.h
to include/asm-x86/kvm.h. Also have include/linux/kvm.h include
include/asm/kvm.h.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/kvm.h | 20 | ||||
| -rw-r--r-- | include/linux/kvm.h | 8 |
2 files changed, 21 insertions, 7 deletions
diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h new file mode 100644 index 000000000000..37cf8e995c83 --- /dev/null +++ b/include/asm-x86/kvm.h @@ -0,0 +1,20 @@ +#ifndef __LINUX_KVM_X86_H +#define __LINUX_KVM_X86_H + +/* + * KVM x86 specific structures and definitions + * + */ + +#include <asm/types.h> +#include <linux/ioctl.h> + +struct kvm_memory_alias { + __u32 slot; /* this has a different namespace than memory slots */ + __u32 flags; + __u64 guest_phys_addr; + __u64 memory_size; + __u64 target_phys_addr; +}; + +#endif diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 71d33d62944f..d09dd5dd5493 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -9,6 +9,7 @@ #include <asm/types.h> #include <linux/ioctl.h> +#include <asm/kvm.h> #define KVM_API_VERSION 12 @@ -35,13 +36,6 @@ struct kvm_userspace_memory_region { /* for kvm_memory_region::flags */ #define KVM_MEM_LOG_DIRTY_PAGES 1UL -struct kvm_memory_alias { - __u32 slot; /* this has a different namespace than memory slots */ - __u32 flags; - __u64 guest_phys_addr; - __u64 memory_size; - __u64 target_phys_addr; -}; /* for KVM_IRQ_LINE */ struct kvm_irq_level { |