[Qemu-devel] [PATCH] VMRUN should store the RIP after the instruction

[Alexander Graf]

VMRUN stores the IP which is used to return to the instruction after the 
VMRUN in case of a VMEXIT. Due to recent changes, this does not happen 
anymore and a VMEXIT simply returns to the VMRUN instruction.

Alex


Index: target-i386/op_helper.c
===================================================================
--- target-i386/op_helper.c     (revision 4661)
+++ target-i386/op_helper.c     (working copy)
@@ -4836,7 +4836,7 @@
     svm_save_seg(env->vm_hsave + offsetof(struct vmcb, save.ds), 
                  &env->segs[R_DS]);
 
-    stq_phys(env->vm_hsave + offsetof(struct vmcb, save.rip), EIP);
+    stq_phys(env->vm_hsave + offsetof(struct vmcb, save.rip), EIP + 3);
     stq_phys(env->vm_hsave + offsetof(struct vmcb, save.rsp), ESP);
     stq_phys(env->vm_hsave + offsetof(struct vmcb, save.rax), EAX);