diff options
| author | Sean Christopherson | 2018-03-08 17:57:27 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2018-03-16 22:01:39 +0100 |
| commit | dca7f1284f49911b459da313ece5d9c6dc3291f6 (patch) | |
| tree | 5fd68e057fa241b07c7c2a6aff4acd01edb17cdc /arch/x86/kvm/svm.c | |
| parent | KVM: VMX: use kvm_fast_pio_in for handling IN I/O (diff) | |
| download | kernel-qcow2-linux-dca7f1284f49911b459da313ece5d9c6dc3291f6.tar.gz kernel-qcow2-linux-dca7f1284f49911b459da313ece5d9c6dc3291f6.tar.xz kernel-qcow2-linux-dca7f1284f49911b459da313ece5d9c6dc3291f6.zip | |
KVM: x86: add kvm_fast_pio() to consolidate fast PIO code
Add kvm_fast_pio() to consolidate duplicate code in VMX and SVM.
Unexport kvm_fast_pio_in() and kvm_fast_pio_out().
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index be9c839e2c89..3ce5ba8dc58b 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2640,7 +2640,7 @@ static int io_interception(struct vcpu_svm *svm) { struct kvm_vcpu *vcpu = &svm->vcpu; u32 io_info = svm->vmcb->control.exit_info_1; /* address size bug? */ - int size, in, string, ret; + int size, in, string; unsigned port; ++svm->vcpu.stat.io_exits; @@ -2652,16 +2652,8 @@ static int io_interception(struct vcpu_svm *svm) port = io_info >> 16; size = (io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT; svm->next_rip = svm->vmcb->control.exit_info_2; - ret = kvm_skip_emulated_instruction(&svm->vcpu); - /* - * TODO: we might be squashing a KVM_GUESTDBG_SINGLESTEP-triggered - * KVM_EXIT_DEBUG here. - */ - if (in) - return kvm_fast_pio_in(vcpu, size, port) && ret; - else - return kvm_fast_pio_out(vcpu, size, port) && ret; + return kvm_fast_pio(&svm->vcpu, size, port, in); } static int nmi_interception(struct vcpu_svm *svm) |