Skip to content

Commit 5381eca

Browse files
sean-jcbonzini
authored andcommitted
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 <[email protected]> Message-ID: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 071f24a commit 5381eca

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

arch/mips/include/asm/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,8 @@ struct kvm_mips_callbacks {
728728
int (*handle_fpe)(struct kvm_vcpu *vcpu);
729729
int (*handle_msa_disabled)(struct kvm_vcpu *vcpu);
730730
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);
733733
int (*check_extension)(struct kvm *kvm, long ext);
734734
int (*vcpu_init)(struct kvm_vcpu *vcpu);
735735
void (*vcpu_uninit)(struct kvm_vcpu *vcpu);

arch/mips/kvm/mips.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
127127

128128
int kvm_arch_enable_virtualization_cpu(void)
129129
{
130-
return kvm_mips_callbacks->hardware_enable();
130+
return kvm_mips_callbacks->enable_virtualization_cpu();
131131
}
132132

133133
void kvm_arch_disable_virtualization_cpu(void)
134134
{
135-
kvm_mips_callbacks->hardware_disable();
135+
kvm_mips_callbacks->disable_virtualization_cpu();
136136
}
137137

138138
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

arch/mips/kvm/vz.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2869,7 +2869,7 @@ static unsigned int kvm_vz_resize_guest_vtlb(unsigned int size)
28692869
return ret + 1;
28702870
}
28712871

2872-
static int kvm_vz_hardware_enable(void)
2872+
static int kvm_vz_enable_virtualization_cpu(void)
28732873
{
28742874
unsigned int mmu_size, guest_mmu_size, ftlb_size;
28752875
u64 guest_cvmctl, cvmvmconfig;
@@ -2983,7 +2983,7 @@ static int kvm_vz_hardware_enable(void)
29832983
return 0;
29842984
}
29852985

2986-
static void kvm_vz_hardware_disable(void)
2986+
static void kvm_vz_disable_virtualization_cpu(void)
29872987
{
29882988
u64 cvmvmconfig;
29892989
unsigned int mmu_size;
@@ -3280,8 +3280,8 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = {
32803280
.handle_msa_disabled = kvm_trap_vz_handle_msa_disabled,
32813281
.handle_guest_exit = kvm_trap_vz_handle_guest_exit,
32823282

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,
32853285
.check_extension = kvm_vz_check_extension,
32863286
.vcpu_init = kvm_vz_vcpu_init,
32873287
.vcpu_uninit = kvm_vz_vcpu_uninit,

0 commit comments

Comments
 (0)