Skip to content

Commit

Permalink
lguest: make emulate_insn receive a vcpu struct.
Browse files Browse the repository at this point in the history
emulate_insn() needs to know about current eip, which will be,
in the future, a per-vcpu thing. So in this patch, the function
prototype is modified to receive a vcpu struct

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Glauber de Oliveira Costa authored and Rusty Russell committed Jan 30, 2008
1 parent 0c78441 commit a3863f6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/lguest/x86/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit a3863f6

Please sign in to comment.