kevin/linux
1
Fork 0
Code

KVM: MIPS: Rename virtualization {en,dis}abling APIs to match common KVM

Browse Source 
Rename MIPS's trampoline hooks for virtualization enabling to match the
recently renamed arch hooks.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-ID: <20240830043600.127750-6-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2024-08-29 21:35:55 -07:00 committed by Paolo Bonzini
parent 071f24ad28
commit 5381eca101
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/include/asm/kvm_host.h
View File

@ -728,8 +728,8 @@ struct kvm_mips_callbacks {
int (*handle_fpe)(struct kvm_vcpu *vcpu); int (*handle_fpe)(struct kvm_vcpu *vcpu);
int (*handle_msa_disabled)(struct kvm_vcpu *vcpu); int (*handle_msa_disabled)(struct kvm_vcpu *vcpu);
int (*handle_guest_exit)(struct kvm_vcpu *vcpu); int (*handle_guest_exit)(struct kvm_vcpu *vcpu);
int (*hardware_enable)(void); int (*enable_virtualization_cpu)(void);
void (*hardware_disable)(void); void (*disable_virtualization_cpu)(void);
int (*check_extension)(struct kvm *kvm, long ext); int (*check_extension)(struct kvm *kvm, long ext);
int (*vcpu_init)(struct kvm_vcpu *vcpu); int (*vcpu_init)(struct kvm_vcpu *vcpu);
void (*vcpu_uninit)(struct kvm_vcpu *vcpu); void (*vcpu_uninit)(struct kvm_vcpu *vcpu);

4
arch/mips/kvm/mips.c
View File

@ -127,12 +127,12 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
int kvm_arch_enable_virtualization_cpu(void) int kvm_arch_enable_virtualization_cpu(void)
{ {
return kvm_mips_callbacks->hardware_enable(); return kvm_mips_callbacks->enable_virtualization_cpu();
} }
void kvm_arch_disable_virtualization_cpu(void) void kvm_arch_disable_virtualization_cpu(void)
{ {
kvm_mips_callbacks->hardware_disable(); kvm_mips_callbacks->disable_virtualization_cpu();
} }
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

8
arch/mips/kvm/vz.c
View File

@ -2869,7 +2869,7 @@ static unsigned int kvm_vz_resize_guest_vtlb(unsigned int size)
return ret + 1; return ret + 1;
} }
static int kvm_vz_hardware_enable(void) static int kvm_vz_enable_virtualization_cpu(void)
{ {
unsigned int mmu_size, guest_mmu_size, ftlb_size; unsigned int mmu_size, guest_mmu_size, ftlb_size;
u64 guest_cvmctl, cvmvmconfig; u64 guest_cvmctl, cvmvmconfig;
@ -2983,7 +2983,7 @@ static int kvm_vz_hardware_enable(void)
return 0; return 0;
} }
static void kvm_vz_hardware_disable(void) static void kvm_vz_disable_virtualization_cpu(void)
{ {
u64 cvmvmconfig; u64 cvmvmconfig;
unsigned int mmu_size; unsigned int mmu_size;
@ -3280,8 +3280,8 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = {
.handle_msa_disabled = kvm_trap_vz_handle_msa_disabled, .handle_msa_disabled = kvm_trap_vz_handle_msa_disabled,
.handle_guest_exit = kvm_trap_vz_handle_guest_exit, .handle_guest_exit = kvm_trap_vz_handle_guest_exit,
.hardware_enable = kvm_vz_hardware_enable, .enable_virtualization_cpu = kvm_vz_enable_virtualization_cpu,
.hardware_disable = kvm_vz_hardware_disable, .disable_virtualization_cpu = kvm_vz_disable_virtualization_cpu,
.check_extension = kvm_vz_check_extension, .check_extension = kvm_vz_check_extension,
.vcpu_init = kvm_vz_vcpu_init, .vcpu_init = kvm_vz_vcpu_init,
.vcpu_uninit = kvm_vz_vcpu_uninit, .vcpu_uninit = kvm_vz_vcpu_uninit,