Skip to content

Commit a6b33d0

Browse files
Yue HaibingMarc Zyngier
authored andcommitted
KVM: arm64: Remove unused declarations
Commit 5369290 ("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 29eb5a3 ("KVM: arm64: Handle PtrAuth traps early") left behind kvm_arm_vcpu_ptrauth_trap(), remove it. Commit 2a0c343 ("KVM: arm64: Initialize trap registers for protected VMs") declared but never implemented kvm_init_protected_traps() and commit cf5d318 ("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> Reviewed-by: Zenghui Yu <zenghui.yu@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20230814140636.45988-1-yuehaibing@huawei.com
1 parent 4460a7d commit a6b33d0

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -967,8 +967,6 @@ void kvm_arm_resume_guest(struct kvm *kvm);
967967
#define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)
968968
#endif /* __KVM_NVHE_HYPERVISOR__ */
969969

970-
void force_vm_exit(const cpumask_t *mask);
971-
972970
int handle_exit(struct kvm_vcpu *vcpu, int exception_index);
973971
void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);
974972

@@ -1049,8 +1047,6 @@ static inline bool kvm_system_needs_idmapped_vectors(void)
10491047
return cpus_have_const_cap(ARM64_SPECTRE_V3A);
10501048
}
10511049

1052-
void kvm_arm_vcpu_ptrauth_trap(struct kvm_vcpu *vcpu);
1053-
10541050
static inline void kvm_arch_sync_events(struct kvm *kvm) {}
10551051
static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
10561052

@@ -1118,8 +1114,6 @@ static inline bool kvm_vm_is_protected(struct kvm *kvm)
11181114
return false;
11191115
}
11201116

1121-
void kvm_init_protected_traps(struct kvm_vcpu *vcpu);
1122-
11231117
int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);
11241118
bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);
11251119

arch/arm64/kvm/vgic/vgic.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu);
199199
void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
200200
void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr);
201201
void vgic_v2_set_underflow(struct kvm_vcpu *vcpu);
202-
void vgic_v2_set_npie(struct kvm_vcpu *vcpu);
203202
int vgic_v2_has_attr_regs(struct kvm_device *dev, struct kvm_device_attr *attr);
204203
int vgic_v2_dist_uaccess(struct kvm_vcpu *vcpu, bool is_write,
205204
int offset, u32 *val);
@@ -233,7 +232,6 @@ void vgic_v3_fold_lr_state(struct kvm_vcpu *vcpu);
233232
void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr);
234233
void vgic_v3_clear_lr(struct kvm_vcpu *vcpu, int lr);
235234
void vgic_v3_set_underflow(struct kvm_vcpu *vcpu);
236-
void vgic_v3_set_npie(struct kvm_vcpu *vcpu);
237235
void vgic_v3_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
238236
void vgic_v3_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
239237
void vgic_v3_enable(struct kvm_vcpu *vcpu);

0 commit comments

Comments
 (0)