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

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: default avatarJerone Young <jyoung5@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 7faa8f6f

include/asm-x86/kvm.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#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

include/linux/kvm.h

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