Commit c0a21c3f authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Remove unused ctxt param from emulator's FPU accessors

Remove an unused struct x86_emulate_ctxt * param from low level helpers
used to access guest FPU state.  The unused param was left behind by
commit 6ab0b9fe ("x86,kvm: remove KVM emulator get_fpu / put_fpu").

No functional change intended.
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2620fe26
...@@ -1090,7 +1090,7 @@ static void emulator_put_fpu(void) ...@@ -1090,7 +1090,7 @@ static void emulator_put_fpu(void)
fpregs_unlock(); fpregs_unlock();
} }
static void read_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, int reg) static void read_sse_reg(sse128_t *data, int reg)
{ {
emulator_get_fpu(); emulator_get_fpu();
switch (reg) { switch (reg) {
...@@ -1117,8 +1117,7 @@ static void read_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, int reg) ...@@ -1117,8 +1117,7 @@ static void read_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, int reg)
emulator_put_fpu(); emulator_put_fpu();
} }
static void write_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, static void write_sse_reg(sse128_t *data, int reg)
int reg)
{ {
emulator_get_fpu(); emulator_get_fpu();
switch (reg) { switch (reg) {
...@@ -1145,7 +1144,7 @@ static void write_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, ...@@ -1145,7 +1144,7 @@ static void write_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data,
emulator_put_fpu(); emulator_put_fpu();
} }
static void read_mmx_reg(struct x86_emulate_ctxt *ctxt, u64 *data, int reg) static void read_mmx_reg(u64 *data, int reg)
{ {
emulator_get_fpu(); emulator_get_fpu();
switch (reg) { switch (reg) {
...@@ -1162,7 +1161,7 @@ static void read_mmx_reg(struct x86_emulate_ctxt *ctxt, u64 *data, int reg) ...@@ -1162,7 +1161,7 @@ static void read_mmx_reg(struct x86_emulate_ctxt *ctxt, u64 *data, int reg)
emulator_put_fpu(); emulator_put_fpu();
} }
static void write_mmx_reg(struct x86_emulate_ctxt *ctxt, u64 *data, int reg) static void write_mmx_reg(u64 *data, int reg)
{ {
emulator_get_fpu(); emulator_get_fpu();
switch (reg) { switch (reg) {
...@@ -1234,7 +1233,7 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, ...@@ -1234,7 +1233,7 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt,
op->type = OP_XMM; op->type = OP_XMM;
op->bytes = 16; op->bytes = 16;
op->addr.xmm = reg; op->addr.xmm = reg;
read_sse_reg(ctxt, &op->vec_val, reg); read_sse_reg(&op->vec_val, reg);
return; return;
} }
if (ctxt->d & Mmx) { if (ctxt->d & Mmx) {
...@@ -1285,7 +1284,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, ...@@ -1285,7 +1284,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
op->type = OP_XMM; op->type = OP_XMM;
op->bytes = 16; op->bytes = 16;
op->addr.xmm = ctxt->modrm_rm; op->addr.xmm = ctxt->modrm_rm;
read_sse_reg(ctxt, &op->vec_val, ctxt->modrm_rm); read_sse_reg(&op->vec_val, ctxt->modrm_rm);
return rc; return rc;
} }
if (ctxt->d & Mmx) { if (ctxt->d & Mmx) {
...@@ -1862,10 +1861,10 @@ static int writeback(struct x86_emulate_ctxt *ctxt, struct operand *op) ...@@ -1862,10 +1861,10 @@ static int writeback(struct x86_emulate_ctxt *ctxt, struct operand *op)
op->bytes * op->count); op->bytes * op->count);
break; break;
case OP_XMM: case OP_XMM:
write_sse_reg(ctxt, &op->vec_val, op->addr.xmm); write_sse_reg(&op->vec_val, op->addr.xmm);
break; break;
case OP_MM: case OP_MM:
write_mmx_reg(ctxt, &op->mm_val, op->addr.mm); write_mmx_reg(&op->mm_val, op->addr.mm);
break; break;
case OP_NONE: case OP_NONE:
/* no writeback */ /* no writeback */
...@@ -5497,11 +5496,10 @@ static int flush_pending_x87_faults(struct x86_emulate_ctxt *ctxt) ...@@ -5497,11 +5496,10 @@ static int flush_pending_x87_faults(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static void fetch_possible_mmx_operand(struct x86_emulate_ctxt *ctxt, static void fetch_possible_mmx_operand(struct operand *op)
struct operand *op)
{ {
if (op->type == OP_MM) if (op->type == OP_MM)
read_mmx_reg(ctxt, &op->mm_val, op->addr.mm); read_mmx_reg(&op->mm_val, op->addr.mm);
} }
static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)) static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *))
...@@ -5580,10 +5578,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -5580,10 +5578,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
* Now that we know the fpu is exception safe, we can fetch * Now that we know the fpu is exception safe, we can fetch
* operands from it. * operands from it.
*/ */
fetch_possible_mmx_operand(ctxt, &ctxt->src); fetch_possible_mmx_operand(&ctxt->src);
fetch_possible_mmx_operand(ctxt, &ctxt->src2); fetch_possible_mmx_operand(&ctxt->src2);
if (!(ctxt->d & Mov)) if (!(ctxt->d & Mov))
fetch_possible_mmx_operand(ctxt, &ctxt->dst); fetch_possible_mmx_operand(&ctxt->dst);
} }
if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && ctxt->intercept) { if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && ctxt->intercept) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment