summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@qumranet.com>2007-12-02 13:18:42 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-12-14 09:50:56 -0800
commite124b02477867e05ba4bc12a1a22b17a537028a8 (patch)
treee714ce2fbe7ea8387e6477f3b4f1485fe4252c56
parent3945c4161ccb0423757e331145144835b3e85b57 (diff)
downloadlinux-stable-e124b02477867e05ba4bc12a1a22b17a537028a8.tar.gz
linux-stable-e124b02477867e05ba4bc12a1a22b17a537028a8.tar.bz2
linux-stable-e124b02477867e05ba4bc12a1a22b17a537028a8.zip
KVM: x86 emulator: Use emulator_write_emulated and not emulator_write_std
patch 00b2ef475d4728ca53a2bc788c7978042907e354 in mainline. emulator_write_std() is not implemented, and calling write_emulated should work just as well in place of write_std. Fixes emulator failures with the push r/m instruction. Signed-off-by: Amit Shah <amit.shah@qumranet.com> Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/kvm/x86_emulate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 14ad4b421c0f..9fce95b56e89 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -1066,7 +1066,7 @@ done_prefixes:
}
register_address_increment(_regs[VCPU_REGS_RSP],
-dst.bytes);
- if ((rc = ops->write_std(
+ if ((rc = ops->write_emulated(
register_address(ctxt->ss_base,
_regs[VCPU_REGS_RSP]),
&dst.val, dst.bytes, ctxt)) != 0)