diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-04 13:41:21 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-10 12:06:03 +0100 |
| commit | 450869d6dbb72b370774fd4ee14c4f275bb08f98 (patch) | |
| tree | 15126a7e93d842e06b6c58d4edc11de29fa5c3c8 /arch/x86/kvm/vmx.c | |
| parent | KVM: VMX: Fix commit which broke PML (diff) | |
| download | linux-450869d6dbb72b370774fd4ee14c4f275bb08f98.tar.xz linux-450869d6dbb72b370774fd4ee14c4f275bb08f98.zip | |
KVM: x86: merge handle_mmio_page_fault and handle_mmio_page_fault_common
They are exactly the same, except that handle_mmio_page_fault
has an unused argument and a call to WARN_ON. Remove the unused
argument from the callers, and move the warning to (the former)
handle_mmio_page_fault_common.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5eb56ed77c1f..a26ed285931b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5908,7 +5908,7 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) return 1; } - ret = handle_mmio_page_fault_common(vcpu, gpa, true); + ret = handle_mmio_page_fault(vcpu, gpa, true); if (likely(ret == RET_MMIO_PF_EMULATE)) return x86_emulate_instruction(vcpu, gpa, 0, NULL, 0) == EMULATE_DONE; |