From: Guillaume Thouvenin Date: Tue, 28 Oct 2008 09:51:30 +0000 (+0100) Subject: KVM: allow emulator to adjust rip for emulated pio instructions X-Git-Tag: v2.6.29-rc1~539^2~108 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93f36bcfaa9e899c595e1c446c784a69021854a;p=pandora-kernel.git 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 Signed-off-by: Avi Kivity --- Reading git-diff-tree failed