Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Sean Christopherson and committed by
Paolo Bonzini
5381eca1 071f24ad

+8 -8
+2 -2
arch/mips/include/asm/kvm_host.h
··· 728 728 int (*handle_fpe)(struct kvm_vcpu *vcpu); 729 729 int (*handle_msa_disabled)(struct kvm_vcpu *vcpu); 730 730 int (*handle_guest_exit)(struct kvm_vcpu *vcpu); 731 - int (*hardware_enable)(void); 732 - void (*hardware_disable)(void); 731 + int (*enable_virtualization_cpu)(void); 732 + void (*disable_virtualization_cpu)(void); 733 733 int (*check_extension)(struct kvm *kvm, long ext); 734 734 int (*vcpu_init)(struct kvm_vcpu *vcpu); 735 735 void (*vcpu_uninit)(struct kvm_vcpu *vcpu);
+2 -2
arch/mips/kvm/mips.c
··· 127 127 128 128 int kvm_arch_enable_virtualization_cpu(void) 129 129 { 130 - return kvm_mips_callbacks->hardware_enable(); 130 + return kvm_mips_callbacks->enable_virtualization_cpu(); 131 131 } 132 132 133 133 void kvm_arch_disable_virtualization_cpu(void) 134 134 { 135 - kvm_mips_callbacks->hardware_disable(); 135 + kvm_mips_callbacks->disable_virtualization_cpu(); 136 136 } 137 137 138 138 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
+4 -4
arch/mips/kvm/vz.c
··· 2869 2869 return ret + 1; 2870 2870 } 2871 2871 2872 - static int kvm_vz_hardware_enable(void) 2872 + static int kvm_vz_enable_virtualization_cpu(void) 2873 2873 { 2874 2874 unsigned int mmu_size, guest_mmu_size, ftlb_size; 2875 2875 u64 guest_cvmctl, cvmvmconfig; ··· 2983 2983 return 0; 2984 2984 } 2985 2985 2986 - static void kvm_vz_hardware_disable(void) 2986 + static void kvm_vz_disable_virtualization_cpu(void) 2987 2987 { 2988 2988 u64 cvmvmconfig; 2989 2989 unsigned int mmu_size; ··· 3280 3280 .handle_msa_disabled = kvm_trap_vz_handle_msa_disabled, 3281 3281 .handle_guest_exit = kvm_trap_vz_handle_guest_exit, 3282 3282 3283 - .hardware_enable = kvm_vz_hardware_enable, 3284 - .hardware_disable = kvm_vz_hardware_disable, 3283 + .enable_virtualization_cpu = kvm_vz_enable_virtualization_cpu, 3284 + .disable_virtualization_cpu = kvm_vz_disable_virtualization_cpu, 3285 3285 .check_extension = kvm_vz_check_extension, 3286 3286 .vcpu_init = kvm_vz_vcpu_init, 3287 3287 .vcpu_uninit = kvm_vz_vcpu_uninit,