diff options
author | Avi Kivity <avi@redhat.com> | 2011-04-20 06:37:53 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-05-11 07:57:11 -0400 |
commit | ca1d4a9e772bde0a0b8cda61ee9fdca29f80f361 (patch) | |
tree | ac64707383caef498f295a3c8fb306af70288c2a /arch/x86/kvm/emulate.c | |
parent | 0f65dd70a442ff498da10cec0a599fbd9d2d6f9e (diff) |
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 ff64b17df772..8af08a16f4dd 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, | |||
1125 | if (n == 0) | 1125 | if (n == 0) |
1126 | n = 1; | 1126 | n = 1; |
1127 | rc->pos = rc->end = 0; | 1127 | rc->pos = rc->end = 0; |
1128 | if (!ops->pio_in_emulated(size, port, rc->data, n, ctxt->vcpu)) | 1128 | if (!ops->pio_in_emulated(ctxt, size, port, rc->data, n)) |
1129 | return 0; | 1129 | return 0; |
1130 | rc->end = n * size; | 1130 | rc->end = n * size; |
1131 | } | 1131 | } |
@@ -3892,8 +3892,8 @@ special_insn: | |||
3892 | case 0xef: /* out dx,(e/r)ax */ | 3892 | case 0xef: /* out dx,(e/r)ax */ |
3893 | c->dst.val = c->regs[VCPU_REGS_RDX]; | 3893 | c->dst.val = c->regs[VCPU_REGS_RDX]; |
3894 | do_io_out: | 3894 | do_io_out: |
3895 | ops->pio_out_emulated(c->src.bytes, c->dst.val, | 3895 | ops->pio_out_emulated(ctxt, c->src.bytes, c->dst.val, |
3896 | &c->src.val, 1, ctxt->vcpu); | 3896 | &c->src.val, 1); |
3897 | c->dst.type = OP_NONE; /* Disable writeback. */ | 3897 | c->dst.type = OP_NONE; /* Disable writeback. */ |
3898 | break; | 3898 | break; |
3899 | case 0xf4: /* hlt */ | 3899 | case 0xf4: /* hlt */ |