diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-03-18 15:20:23 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:16:25 +0300 |
| commit | cf8f70bfe38b326bb80b10f76d6544f571040229 (patch) | |
| tree | d646456d773a887ca592d174b3d45a57d2779d85 /arch/x86/include/asm/kvm_emulate.h | |
| parent | d9271123a46011af26da680baeb7fdf67b498abf (diff) | |
| download | op-kernel-dev-cf8f70bfe38b326bb80b10f76d6544f571040229.zip op-kernel-dev-cf8f70bfe38b326bb80b10f76d6544f571040229.tar.gz | |
KVM: x86 emulator: fix in/out emulation.
in/out emulation is broken now. The breakage is different depending
on where IO device resides. If it is in userspace emulator reports
emulation failure since it incorrectly interprets kvm_emulate_pio()
return value. If IO device is in the kernel emulation of 'in' will do
nothing since kvm_emulate_pio() stores result directly into vcpu
registers, so emulator will overwrite result of emulation during
commit of shadowed register.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/kvm_emulate.h')
| -rw-r--r-- | arch/x86/include/asm/kvm_emulate.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index bd46929..679245c 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -119,6 +119,13 @@ struct x86_emulate_ops { const void *new, unsigned int bytes, struct kvm_vcpu *vcpu); + + int (*pio_in_emulated)(int size, unsigned short port, void *val, + unsigned int count, struct kvm_vcpu *vcpu); + + int (*pio_out_emulated)(int size, unsigned short port, const void *val, + unsigned int count, struct kvm_vcpu *vcpu); + bool (*get_cached_descriptor)(struct desc_struct *desc, int seg, struct kvm_vcpu *vcpu); void (*set_cached_descriptor)(struct desc_struct *desc, |
