---

yaml
---
r: 80911
b: refs/heads/master
c: a3863f6
h: refs/heads/master
i:
  80909: 8856fde
  80907: a5d02cd
  80903: 7be0b98
  80895: 8751fd4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c78441cf4dd66f66e23dc085f0cc1e3e8669b96
+refs/heads/master: a3863f68b0d7fe2073c0f4efe534ec87a685c4fa

trunk/drivers/lguest/x86/core.c

@@ -218,8 +218,9 @@ void lguest_arch_run_guest(struct lg_cpu *cpu)
  * When the Guest uses one of these instructions, we get a trap (General
  * Protection Fault) and come here.  We see if it's one of those troublesome
  * instructions and skip over it.  We return true if we did. */
-static int emulate_insn(struct lguest *lg)
+static int emulate_insn(struct lg_cpu *cpu)
 {
+	struct lguest *lg = cpu->lg;
 	u8 insn;
 	unsigned int insnlen = 0, in = 0, shift = 0;
 	/* The eip contains the *virtual* address of the Guest's instruction:
@@ -292,7 +293,7 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
 		 * instructions which we need to emulate.  If so, we just go
 		 * back into the Guest after we've done it. */
 		if (lg->regs->errcode == 0) {
-			if (emulate_insn(lg))
+			if (emulate_insn(cpu))
 				return;
 		}
 		break;