Commit d750951c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: powerpc: move powerpc-specific structs to uapi/asm/kvm.h 



While this in principle breaks the appearance of KVM_PPC_* ioctls on architectures
other than powerpc, this seems unlikely to be a problem considering that there are
already many "struct kvm_ppc_*" definitions in arch/powerpc/include/uapi.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bcac0477

arch/powerpc/include/uapi/asm/kvm.h

+44 −0
Original line number Diff line number Diff line
@@ -733,4 +733,48 @@ struct kvm_ppc_xive_eq { 
#define KVM_XIVE_TIMA_PAGE_OFFSET	0

#define KVM_XIVE_ESB_PAGE_OFFSET	4



/* for KVM_PPC_GET_PVINFO */



#define KVM_PPC_PVINFO_FLAGS_EV_IDLE   (1<<0)



struct kvm_ppc_pvinfo {

	/* out */

	__u32 flags;

	__u32 hcall[4];

	__u8  pad[108];

};



/* for KVM_PPC_GET_SMMU_INFO */

#define KVM_PPC_PAGE_SIZES_MAX_SZ	8



struct kvm_ppc_one_page_size {

	__u32 page_shift;	/* Page shift (or 0) */

	__u32 pte_enc;		/* Encoding in the HPTE (>>12) */

};



struct kvm_ppc_one_seg_page_size {

	__u32 page_shift;	/* Base page shift of segment (or 0) */

	__u32 slb_enc;		/* SLB encoding for BookS */

	struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



#define KVM_PPC_PAGE_SIZES_REAL		0x00000001

#define KVM_PPC_1T_SEGMENTS		0x00000002

#define KVM_PPC_NO_HASH			0x00000004



struct kvm_ppc_smmu_info {

	__u64 flags;

	__u32 slb_size;

	__u16 data_keys;	/* # storage keys supported for data */

	__u16 instr_keys;	/* # storage keys supported for instructions */

	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



/* for KVM_PPC_RESIZE_HPT_{PREPARE,COMMIT} */

struct kvm_ppc_resize_hpt {

	__u64 flags;

	__u32 shift;

	__u32 pad;

};



#endif /* __LINUX_KVM_POWERPC_H */

include/uapi/linux/kvm.h

+0 −44
Original line number Diff line number Diff line
@@ -810,50 +810,6 @@ struct kvm_enable_cap { 
	__u8  pad[64];

};



/* for KVM_PPC_GET_PVINFO */



#define KVM_PPC_PVINFO_FLAGS_EV_IDLE   (1<<0)



struct kvm_ppc_pvinfo {

	/* out */

	__u32 flags;

	__u32 hcall[4];

	__u8  pad[108];

};



/* for KVM_PPC_GET_SMMU_INFO */

#define KVM_PPC_PAGE_SIZES_MAX_SZ	8



struct kvm_ppc_one_page_size {

	__u32 page_shift;	/* Page shift (or 0) */

	__u32 pte_enc;		/* Encoding in the HPTE (>>12) */

};



struct kvm_ppc_one_seg_page_size {

	__u32 page_shift;	/* Base page shift of segment (or 0) */

	__u32 slb_enc;		/* SLB encoding for BookS */

	struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



#define KVM_PPC_PAGE_SIZES_REAL		0x00000001

#define KVM_PPC_1T_SEGMENTS		0x00000002

#define KVM_PPC_NO_HASH			0x00000004



struct kvm_ppc_smmu_info {

	__u64 flags;

	__u32 slb_size;

	__u16 data_keys;	/* # storage keys supported for data */

	__u16 instr_keys;	/* # storage keys supported for instructions */

	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



/* for KVM_PPC_RESIZE_HPT_{PREPARE,COMMIT} */

struct kvm_ppc_resize_hpt {

	__u64 flags;

	__u32 shift;

	__u32 pad;

};



#define KVMIO 0xAE



/* machine type bits, to be used as argument to KVM_CREATE_VM */