---

yaml --- r: 202257 b: refs/heads/master c: 54b8486 h: refs/heads/master i: 202255: d642747 v: v3
git-mirror · Aug 1, 2010 · dca6571 · dca6571
1 parent bb32817
commit dca6571
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 51 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95cb229530f329ec8002274891793be9c91385f7
+refs/heads/master: 54b8486f469475d6c8e8aec917b91239a54eb8c8
diff --git a/trunk/arch/x86/include/asm/kvm_emulate.h b/trunk/arch/x86/include/asm/kvm_emulate.h
@@ -216,6 +216,12 @@ struct x86_emulate_ctxt {
 	int interruptibility;
 
 	bool restart; /* restart string instruction after writeback */
+
+	int exception; /* exception that happens during emulation or -1 */
+	u32 error_code; /* error code for exception */
+	bool error_code_valid;
+	unsigned long cr2; /* faulted address in case of #PF */
+
 	/* decode cache */
 	struct decode_cache decode;
 };