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

Commit 0865e636 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: static inline empty kvm_arch functions 



Using static inline is going to save few bytes and cycles.
For example on powerpc, the difference is 700 B after stripping.
(5 kB before)

This patch also deals with two overlooked empty functions:
kvm_arch_flush_shadow was not removed from arch/mips/kvm/mips.c
  2df72e9b KVM: split kvm_arch_flush_shadow
and kvm_arch_sched_in never made it into arch/ia64/kvm/kvm-ia64.c.
  e790d9ef KVM: add kvm_arch_sched_in

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 65647300

arch/arm/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -230,4 +230,10 @@ static inline void vgic_arch_setup(const struct vgic_params *vgic) 
int kvm_perf_init(void);

int kvm_perf_teardown(void);



static inline void kvm_arch_hardware_disable(void *garbage) {}

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/kvm/arm.c

+0 −19
Original line number Diff line number Diff line
@@ -97,27 +97,16 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE;

}



void kvm_arch_hardware_disable(void *garbage)

{

}



int kvm_arch_hardware_setup(void)

{

	return 0;

}



void kvm_arch_hardware_unsetup(void)

{

}



void kvm_arch_check_processor_compat(void *rtn)

{

	*(int *)rtn = 0;

}



void kvm_arch_sync_events(struct kvm *kvm)

{

}



/**

 * kvm_arch_init_vm - initializes a VM data structure
@@ -284,14 +273,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	return 0;

}



void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)

{

}



void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)

{

}



void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

{

	vcpu->cpu = cpu;

arch/arm64/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -242,4 +242,10 @@ static inline void vgic_arch_setup(const struct vgic_params *vgic) 
	}

}



static inline void kvm_arch_hardware_disable(void *garbage) {}

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}



#endif /* __ARM64_KVM_HOST_H__ */

arch/ia64/include/asm/kvm_host.h

+12 −0
Original line number Diff line number Diff line
@@ -592,6 +592,18 @@ void kvm_sal_emul(struct kvm_vcpu *vcpu); 
struct kvm *kvm_arch_alloc_vm(void);

void kvm_arch_free_vm(struct kvm *kvm);



static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_free_memslot(struct kvm *kvm,

		struct kvm_memory_slot *free, struct kvm_memory_slot *dont) {}

static inline void kvm_arch_memslots_updated(struct kvm *kvm) {}

static inline void kvm_arch_commit_memory_region(struct kvm *kvm,

		struct kvm_userspace_memory_region *mem,

		const struct kvm_memory_slot *old,

		enum kvm_mr_change change) {}

static inline void kvm_arch_hardware_unsetup(void) {}



#endif /* __ASSEMBLY__*/



#endif

arch/ia64/kvm/kvm-ia64.c

+0 −30
Original line number Diff line number Diff line
@@ -1364,10 +1364,6 @@ static void kvm_release_vm_pages(struct kvm *kvm) 
	}

}



void kvm_arch_sync_events(struct kvm *kvm)

{

}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvm_iommu_unmap_guest(kvm);
@@ -1376,10 +1372,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kvm_release_vm_pages(kvm);

}



void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)

{

}



void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

{

	if (cpu != vcpu->cpu) {
@@ -1468,7 +1460,6 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) 
	kfree(vcpu->arch.apic);

}





long kvm_arch_vcpu_ioctl(struct file *filp,

			 unsigned int ioctl, unsigned long arg)

{
@@ -1551,21 +1542,12 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
	return VM_FAULT_SIGBUS;

}



void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,

			   struct kvm_memory_slot *dont)

{

}



int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,

			    unsigned long npages)

{

	return 0;

}



void kvm_arch_memslots_updated(struct kvm *kvm)

{

}



int kvm_arch_prepare_memory_region(struct kvm *kvm,

		struct kvm_memory_slot *memslot,

		struct kvm_userspace_memory_region *mem,
@@ -1597,14 +1579,6 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	return 0;

}



void kvm_arch_commit_memory_region(struct kvm *kvm,

		struct kvm_userspace_memory_region *mem,

		const struct kvm_memory_slot *old,

		enum kvm_mr_change change)

{

	return;

}



void kvm_arch_flush_shadow_all(struct kvm *kvm)

{

	kvm_flush_remote_tlbs(kvm);
@@ -1853,10 +1827,6 @@ int kvm_arch_hardware_setup(void) 
	return 0;

}



void kvm_arch_hardware_unsetup(void)

{

}



int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq)

{

	return __apic_accept_irq(vcpu, irq->vector);