diff options
| author | Sean Christopherson | 2018-08-23 22:56:52 +0200 |
|---|---|---|
| committer | Radim Krčmář | 2018-08-30 16:20:44 +0200 |
| commit | 0ce97a2b627c5e26347aee298f571ddf925e5fe4 (patch) | |
| tree | 52687003208926739cf192d4e1b563767cd4b8c4 /arch/x86/kvm/x86.c | |
| parent | KVM: x86: Do not re-{try,execute} after failed emulation in L2 (diff) | |
| download | kernel-qcow2-linux-0ce97a2b627c5e26347aee298f571ddf925e5fe4.tar.gz kernel-qcow2-linux-0ce97a2b627c5e26347aee298f571ddf925e5fe4.tar.xz kernel-qcow2-linux-0ce97a2b627c5e26347aee298f571ddf925e5fe4.zip | |
KVM: x86: Rename emulate_instruction() to kvm_emulate_instruction()
Lack of the kvm_ prefix gives the impression that it's a VMX or SVM
specific function, and there's no conflict that prevents adding the
kvm_ prefix.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index cbe2921e972b..915002c7f07e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4987,7 +4987,7 @@ int handle_ud(struct kvm_vcpu *vcpu) emul_type = 0; } - er = emulate_instruction(vcpu, emul_type); + er = kvm_emulate_instruction(vcpu, emul_type); if (er == EMULATE_USER_EXIT) return 0; if (er != EMULATE_DONE) @@ -7740,7 +7740,7 @@ static inline int complete_emulated_io(struct kvm_vcpu *vcpu) { int r; vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); - r = emulate_instruction(vcpu, EMULTYPE_NO_DECODE); + r = kvm_emulate_instruction(vcpu, EMULTYPE_NO_DECODE); srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx); if (r != EMULATE_DONE) return 0; |