diff mbox series

[-next] KVM: arm64: Remove unused declarations

Message ID 20230814140636.45988-1-yuehaibing@huawei.com (mailing list archive)
State New, archived
Headers show
Series [-next] KVM: arm64: Remove unused declarations | expand

Commit Message

Yue Haibing Aug. 14, 2023, 2:06 p.m. UTC 
Commit 53692908b0f5 ("KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI")
removed vgic_v2_set_npie()/vgic_v3_set_npie() but not the declarations.
Commit 29eb5a3c57f7 ("KVM: arm64: Handle PtrAuth traps early") left behind
kvm_arm_vcpu_ptrauth_trap(), remove it.
Commit 2a0c343386ae ("KVM: arm64: Initialize trap registers for protected VMs")
declared but never implemented kvm_init_protected_traps() and
commit cf5d318865e2 ("arm/arm64: KVM: Turn off vcpus on PSCI shutdown/reboot")
declared but never implemented force_vm_exit().

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
---
 arch/arm64/include/asm/kvm_host.h | 6 ------
 arch/arm64/kvm/vgic/vgic.h        | 2 --
 2 files changed, 8 deletions(-)

Comments

Zenghui Yu Aug. 14, 2023, 3:33 p.m. UTC | #1 
On 2023/8/14 22:06, Yue Haibing wrote:
> Commit 53692908b0f5 ("KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI")
> removed vgic_v2_set_npie()/vgic_v3_set_npie() but not the declarations.
> Commit 29eb5a3c57f7 ("KVM: arm64: Handle PtrAuth traps early") left behind
> kvm_arm_vcpu_ptrauth_trap(), remove it.
> Commit 2a0c343386ae ("KVM: arm64: Initialize trap registers for protected VMs")
> declared but never implemented kvm_init_protected_traps() and
> commit cf5d318865e2 ("arm/arm64: KVM: Turn off vcpus on PSCI shutdown/reboot")
> declared but never implemented force_vm_exit().
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
> ---
>  arch/arm64/include/asm/kvm_host.h | 6 ------
>  arch/arm64/kvm/vgic/vgic.h        | 2 --
>  2 files changed, 8 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index d7b1403a3fb2..7dbcee57f565 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -967,8 +967,6 @@ void kvm_arm_resume_guest(struct kvm *kvm);
>  #define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)
>  #endif /* __KVM_NVHE_HYPERVISOR__ */
>  
> -void force_vm_exit(const cpumask_t *mask);
> -
>  int handle_exit(struct kvm_vcpu *vcpu, int exception_index);
>  void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);
>  
> @@ -1049,8 +1047,6 @@ static inline bool kvm_system_needs_idmapped_vectors(void)
>  	return cpus_have_const_cap(ARM64_SPECTRE_V3A);
>  }
>  
> -void kvm_arm_vcpu_ptrauth_trap(struct kvm_vcpu *vcpu);
> -
>  static inline void kvm_arch_sync_events(struct kvm *kvm) {}
>  static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
>  
> @@ -1118,8 +1114,6 @@ static inline bool kvm_vm_is_protected(struct kvm *kvm)
>  	return false;
>  }
>  
> -void kvm_init_protected_traps(struct kvm_vcpu *vcpu);
> -
>  int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);
>  bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);
>  
> diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h
> index f9923beedd27..0ab09b0d4440 100644
> --- a/arch/arm64/kvm/vgic/vgic.h
> +++ b/arch/arm64/kvm/vgic/vgic.h
> @@ -199,7 +199,6 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu);
>  void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
>  void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr);
>  void vgic_v2_set_underflow(struct kvm_vcpu *vcpu);
> -void vgic_v2_set_npie(struct kvm_vcpu *vcpu);
>  int vgic_v2_has_attr_regs(struct kvm_device *dev, struct kvm_device_attr *attr);
>  int vgic_v2_dist_uaccess(struct kvm_vcpu *vcpu, bool is_write,
>  			 int offset, u32 *val);
> @@ -233,7 +232,6 @@ void vgic_v3_fold_lr_state(struct kvm_vcpu *vcpu);
>  void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
>  void vgic_v3_clear_lr(struct kvm_vcpu *vcpu, int lr);
>  void vgic_v3_set_underflow(struct kvm_vcpu *vcpu);
> -void vgic_v3_set_npie(struct kvm_vcpu *vcpu);
>  void vgic_v3_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
>  void vgic_v3_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
>  void vgic_v3_enable(struct kvm_vcpu *vcpu);

Looks good,

Reviewed-by: Zenghui Yu <zenghui.yu@linux.dev>
Marc Zyngier Aug. 15, 2023, 7:29 p.m. UTC | #2 
On Mon, 14 Aug 2023 22:06:36 +0800, Yue Haibing wrote:
> Commit 53692908b0f5 ("KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI")
> removed vgic_v2_set_npie()/vgic_v3_set_npie() but not the declarations.
> Commit 29eb5a3c57f7 ("KVM: arm64: Handle PtrAuth traps early") left behind
> kvm_arm_vcpu_ptrauth_trap(), remove it.
> Commit 2a0c343386ae ("KVM: arm64: Initialize trap registers for protected VMs")
> declared but never implemented kvm_init_protected_traps() and
> commit cf5d318865e2 ("arm/arm64: KVM: Turn off vcpus on PSCI shutdown/reboot")
> declared but never implemented force_vm_exit().

Applied to next, thanks!

[1/1] KVM: arm64: Remove unused declarations
      commit: a6b33d009fc1fe80c935f18b714b36c81e1f1400

Cheers,

	M.
diff mbox series

Patch

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index d7b1403a3fb2..7dbcee57f565 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -967,8 +967,6 @@  void kvm_arm_resume_guest(struct kvm *kvm);
 #define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)
 #endif /* __KVM_NVHE_HYPERVISOR__ */
 
-void force_vm_exit(const cpumask_t *mask);
-
 int handle_exit(struct kvm_vcpu *vcpu, int exception_index);
 void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);
 
@@ -1049,8 +1047,6 @@  static inline bool kvm_system_needs_idmapped_vectors(void)
 	return cpus_have_const_cap(ARM64_SPECTRE_V3A);
 }
 
-void kvm_arm_vcpu_ptrauth_trap(struct kvm_vcpu *vcpu);
-
 static inline void kvm_arch_sync_events(struct kvm *kvm) {}
 static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
 
@@ -1118,8 +1114,6 @@  static inline bool kvm_vm_is_protected(struct kvm *kvm)
 	return false;
 }
 
-void kvm_init_protected_traps(struct kvm_vcpu *vcpu);
-
 int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);
 bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);
 
diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h
index f9923beedd27..0ab09b0d4440 100644
--- a/arch/arm64/kvm/vgic/vgic.h
+++ b/arch/arm64/kvm/vgic/vgic.h
@@ -199,7 +199,6 @@  void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu);
 void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
 void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr);
 void vgic_v2_set_underflow(struct kvm_vcpu *vcpu);
-void vgic_v2_set_npie(struct kvm_vcpu *vcpu);
 int vgic_v2_has_attr_regs(struct kvm_device *dev, struct kvm_device_attr *attr);
 int vgic_v2_dist_uaccess(struct kvm_vcpu *vcpu, bool is_write,
 			 int offset, u32 *val);
@@ -233,7 +232,6 @@  void vgic_v3_fold_lr_state(struct kvm_vcpu *vcpu);
 void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
 void vgic_v3_clear_lr(struct kvm_vcpu *vcpu, int lr);
 void vgic_v3_set_underflow(struct kvm_vcpu *vcpu);
-void vgic_v3_set_npie(struct kvm_vcpu *vcpu);
 void vgic_v3_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
 void vgic_v3_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
 void vgic_v3_enable(struct kvm_vcpu *vcpu);