Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

KVM: forward declare structs in kvm_types.h 



Opaque KVM structs are useful for prototypes in asm/kvm_host.h, to avoid
"'struct foo' declared inside parameter list" warnings (and consequent
breakage due to conflicting types).

Move them from individual files to a generic place in linux/kvm_types.h.

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

arch/arm/include/asm/kvm_host.h

+2 −5
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#ifndef __ARM_KVM_HOST_H__

#define __ARM_KVM_HOST_H__



#include <linux/types.h>

#include <linux/kvm_types.h>

#include <asm/kvm.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>
@@ -40,7 +42,6 @@ 


#include <kvm/arm_vgic.h>



struct kvm_vcpu;

u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
@@ -149,20 +150,17 @@ struct kvm_vcpu_stat { 
	u32 halt_wakeup;

};



struct kvm_vcpu_init;

int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,

			const struct kvm_vcpu_init *init);

int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

struct kvm_one_reg;

int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

u64 kvm_call_hyp(void *hypfn, ...);

void force_vm_exit(const cpumask_t *mask);



#define KVM_ARCH_WANT_MMU_NOTIFIER

struct kvm;

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);
@@ -187,7 +185,6 @@ struct kvm_vcpu __percpu **kvm_get_running_vcpus(void); 


int kvm_arm_copy_coproc_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

unsigned long kvm_arm_num_coproc_regs(struct kvm_vcpu *vcpu);

struct kvm_one_reg;

int kvm_arm_coproc_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);

int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *);

arch/arm64/include/asm/kvm_host.h

+2 −4
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#ifndef __ARM64_KVM_HOST_H__

#define __ARM64_KVM_HOST_H__



#include <linux/types.h>

#include <linux/kvm_types.h>

#include <asm/kvm.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>
@@ -41,7 +43,6 @@ 


#define KVM_VCPU_MAX_FEATURES 3



struct kvm_vcpu;

int kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

int kvm_arch_dev_ioctl_check_extension(long ext);
@@ -164,18 +165,15 @@ struct kvm_vcpu_stat { 
	u32 halt_wakeup;

};



struct kvm_vcpu_init;

int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,

			const struct kvm_vcpu_init *init);

int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

struct kvm_one_reg;

int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);



#define KVM_ARCH_WANT_MMU_NOTIFIER

struct kvm;

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

arch/ia64/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ struct kvm_vm_data { 
#define KVM_REQ_PTC_G		32

#define KVM_REQ_RESUME		33



struct kvm;

struct kvm_vcpu;



struct kvm_mmio_req {

	uint64_t addr;          /*  physical address		*/

	uint64_t size;          /*  size in bytes		*/

arch/mips/include/asm/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ 
#define CAUSEB_DC			27

#define CAUSEF_DC			(_ULCAST_(1) << 27)



struct kvm;

struct kvm_run;

struct kvm_vcpu;

struct kvm_interrupt;



extern atomic_t kvm_mips_instance;

extern pfn_t(*kvm_mips_gfn_to_pfn) (struct kvm *kvm, gfn_t gfn);

extern void (*kvm_mips_release_pfn_clean) (pfn_t pfn);

arch/powerpc/include/asm/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 


#define KVM_ARCH_WANT_MMU_NOTIFIER



struct kvm;

extern int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

extern int kvm_unmap_hva_range(struct kvm *kvm,

			       unsigned long start, unsigned long end);
@@ -76,10 +75,6 @@ extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); 
/* Physical Address Mask - allowed range of real mode RAM access */

#define KVM_PAM			0x0fffffffffffffffULL



struct kvm;

struct kvm_run;

struct kvm_vcpu;



struct lppaca;

struct slb_shadow;

struct dtl_entry;