commit 872929aa59cba19fd83b98f87929ccda12a2cbbb
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 28 16:16:54 2008 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 28 16:16:54 2008 +0000
tree c48d33acaf7c44d48c35507fba462b84f1022149
parent 893f986502196aeb43d176161179c3ff22a7e0a8

SVM rework

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4605 c046a42c-6fe2-441c-8c8c-71466251a162

target-i386/helper.c

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 133754d..7ce3de3 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1096,16 +1096,15 @@
         (env->efer & MSR_EFER_NXE) &&
         (env->cr[4] & CR4_PAE_MASK))
         error_code |= PG_ERROR_I_D_MASK;
-    if (INTERCEPTEDl(_exceptions, 1 << EXCP0E_PAGE)) {
-        stq_phys(env->vm_vmcb + offsetof(struct vmcb, control.exit_info_2), addr);
+    if (env->intercept_exceptions & (1 << EXCP0E_PAGE)) {
+        /* cr2 is not modified in case of exceptions */
+        stq_phys(env->vm_vmcb + offsetof(struct vmcb, control.exit_info_2), 
+                 addr);
     } else {
         env->cr[2] = addr;
     }
     env->error_code = error_code;
     env->exception_index = EXCP0E_PAGE;
-    /* the VMM will handle this */
-    if (INTERCEPTEDl(_exceptions, 1 << EXCP0E_PAGE))
-        return 2;
     return 1;
 }