diff options
| author | Avi Kivity <avi@redhat.com> | 2011-04-20 10:37:53 (GMT) |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-05-11 11:57:11 (GMT) |
| commit | ca1d4a9e772bde0a0b8cda61ee9fdca29f80f361 (patch) | |
| tree | ac64707383caef498f295a3c8fb306af70288c2a /arch/x86/kvm/emulate.c | |
| parent | 0f65dd70a442ff498da10cec0a599fbd9d2d6f9e (diff) | |
| download | linux-fsl-qoriq-ca1d4a9e772bde0a0b8cda61ee9fdca29f80f361.tar.xz | |
KVM: x86 emulator: drop vcpu argument from pio callbacks
Making the emulator caller agnostic.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index ff64b17..8af08a1 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1125,7 +1125,7 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt, if (n == 0) n = 1; rc->pos = rc->end = 0; - if (!ops->pio_in_emulated(size, port, rc->data, n, ctxt->vcpu)) + if (!ops->pio_in_emulated(ctxt, size, port, rc->data, n)) return 0; rc->end = n * size; } @@ -3892,8 +3892,8 @@ special_insn: case 0xef: /* out dx,(e/r)ax */ c->dst.val = c->regs[VCPU_REGS_RDX]; do_io_out: - ops->pio_out_emulated(c->src.bytes, c->dst.val, - &c->src.val, 1, ctxt->vcpu); + ops->pio_out_emulated(ctxt, c->src.bytes, c->dst.val, + &c->src.val, 1); c->dst.type = OP_NONE; /* Disable writeback. */ break; case 0xf4: /* hlt */ |