diff options
| author |   Guillaume Thouvenin <guillaume.thouvenin@ext.bull.net> | 2008-10-28 10:51:30 +0100 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2008-12-31 16:51:48 +0200 |
| commit | e93f36bcfaa9e899c595e1c446c784a69021854a (patch) | |
| tree | 25a506f2427ee4cd8f7197a7748fc90efd0bf7b8 /arch/x86/kvm/vmx.c | |
| parent | KVM: SVM: Set the 'busy' flag of the TR selector (diff) | |
| download | linux-dev-e93f36bcfaa9e899c595e1c446c784a69021854a.tar.xz linux-dev-e93f36bcfaa9e899c595e1c446c784a69021854a.zip | |
KVM: allow emulator to adjust rip for emulated pio instructions
If we call the emulator we shouldn't call skip_emulated_instruction()
in the first place, since the emulator already computes the next rip
for us. Thus we move ->skip_emulated_instruction() out of
kvm_emulate_pio() and into handle_io() (and the svm equivalent). We
also replaced "return 0" by "break" in the "do_io:" case because now
the shadow register state needs to be committed. Otherwise eip will never
be updated.
Signed-off-by: Guillaume Thouvenin <guillaume.thouvenin@ext.bull.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 7623eb7b68d5..816d23185fb8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2687,6 +2687,7 @@ static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) rep = (exit_qualification & 32) != 0; port = exit_qualification >> 16; + skip_emulated_instruction(vcpu); return kvm_emulate_pio(vcpu, kvm_run, in, size, port); } |