Skip to content

L
linux
Commit 4bff1e86 authored by Avi Kivity's avatar Avi Kivity
Browse files
Options

KVM: x86 emulator: drop vcpu argument from segment/gdt/idt callbacks 

Making the emulator caller agnostic.

[Takuya Yoshikawa: fix typo leading to LDT failures]
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ca1d4a9e
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 83 deletions
arch/x86/include/asm/kvm_emulate.h
View file @ 4bff1e86
...@@ -163,15 +163,19 @@ struct x86_emulate_ops { ...@@ -163,15 +163,19 @@ struct x86_emulate_ops {
int size, unsigned short port, const void *val, int size, unsigned short port, const void *val,
unsigned int count); unsigned int count);
bool (*get_cached_descriptor)(struct desc_struct *desc, u32 *base3, bool (*get_cached_descriptor)(struct x86_emulate_ctxt *ctxt,
int seg, struct kvm_vcpu *vcpu); struct desc_struct *desc, u32 *base3,
void (*set_cached_descriptor)(struct desc_struct *desc, u32 base3, int seg);
int seg, struct kvm_vcpu *vcpu); void (*set_cached_descriptor)(struct x86_emulate_ctxt *ctxt,
u16 (*get_segment_selector)(int seg, struct kvm_vcpu *vcpu); struct desc_struct *desc, u32 base3,
void (*set_segment_selector)(u16 sel, int seg, struct kvm_vcpu *vcpu); int seg);
unsigned long (*get_cached_segment_base)(int seg, struct kvm_vcpu *vcpu); u16 (*get_segment_selector)(struct x86_emulate_ctxt *ctxt, int seg);
void (*get_gdt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu); void (*set_segment_selector)(struct x86_emulate_ctxt *ctxt,
void (*get_idt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu); u16 sel, int seg);
unsigned long (*get_cached_segment_base)(struct x86_emulate_ctxt *ctxt,
int seg);
void (*get_gdt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
void (*get_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu); ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu); int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
int (*cpl)(struct kvm_vcpu *vcpu); int (*cpl)(struct kvm_vcpu *vcpu);
......
arch/x86/kvm/emulate.c
View file @ 4bff1e86
...@@ -495,7 +495,7 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, ...@@ -495,7 +495,7 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt,
if (ctxt->mode == X86EMUL_MODE_PROT64 && seg < VCPU_SREG_FS) if (ctxt->mode == X86EMUL_MODE_PROT64 && seg < VCPU_SREG_FS)
return 0; return 0;
return ops->get_cached_segment_base(seg, ctxt->vcpu); return ops->get_cached_segment_base(ctxt, seg);
} }
static unsigned seg_override(struct x86_emulate_ctxt *ctxt, static unsigned seg_override(struct x86_emulate_ctxt *ctxt,
...@@ -573,8 +573,8 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, ...@@ -573,8 +573,8 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
return emulate_gp(ctxt, 0); return emulate_gp(ctxt, 0);
break; break;
default: default:
usable = ctxt->ops->get_cached_descriptor(&desc, NULL, addr.seg, usable = ctxt->ops->get_cached_descriptor(ctxt, &desc, NULL,
ctxt->vcpu); addr.seg);
if (!usable) if (!usable)
goto bad; goto bad;
/* code segment or read-only data segment */ /* code segment or read-only data segment */
...@@ -597,7 +597,7 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, ...@@ -597,7 +597,7 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
goto bad; goto bad;
} }
cpl = ctxt->ops->cpl(ctxt->vcpu); cpl = ctxt->ops->cpl(ctxt->vcpu);
rpl = ctxt->ops->get_segment_selector(addr.seg, ctxt->vcpu) & 3; rpl = ctxt->ops->get_segment_selector(ctxt, addr.seg) & 3;
cpl = max(cpl, rpl); cpl = max(cpl, rpl);
if (!(desc.type & 8)) { if (!(desc.type & 8)) {
/* data segment */ /* data segment */
...@@ -1142,14 +1142,14 @@ static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt, ...@@ -1142,14 +1142,14 @@ static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
if (selector & 1 << 2) { if (selector & 1 << 2) {
struct desc_struct desc; struct desc_struct desc;
memset (dt, 0, sizeof *dt); memset (dt, 0, sizeof *dt);
if (!ops->get_cached_descriptor(&desc, NULL, VCPU_SREG_LDTR, if (!ops->get_cached_descriptor(ctxt, &desc, NULL,
ctxt->vcpu)) VCPU_SREG_LDTR))
return; return;
dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */ dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
dt->address = get_desc_base(&desc); dt->address = get_desc_base(&desc);
} else } else
ops->get_gdt(dt, ctxt->vcpu); ops->get_gdt(ctxt, dt);
} }
/* allowed just for 8 bytes segments */ /* allowed just for 8 bytes segments */
...@@ -1304,8 +1304,8 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt, ...@@ -1304,8 +1304,8 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
return ret; return ret;
} }
load: load:
ops->set_segment_selector(selector, seg, ctxt->vcpu); ops->set_segment_selector(ctxt, selector, seg);
ops->set_cached_descriptor(&seg_desc, 0, seg, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &seg_desc, 0, seg);
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
exception: exception:
emulate_exception(ctxt, err_vec, err_code, true); emulate_exception(ctxt, err_vec, err_code, true);
...@@ -1446,7 +1446,7 @@ static int emulate_push_sreg(struct x86_emulate_ctxt *ctxt, ...@@ -1446,7 +1446,7 @@ static int emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
c->src.val = ops->get_segment_selector(seg, ctxt->vcpu); c->src.val = ops->get_segment_selector(ctxt, seg);
return em_push(ctxt); return em_push(ctxt);
} }
...@@ -1527,7 +1527,7 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt, ...@@ -1527,7 +1527,7 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt,
ctxt->eflags &= ~(EFLG_IF | EFLG_TF | EFLG_AC); ctxt->eflags &= ~(EFLG_IF | EFLG_TF | EFLG_AC);
c->src.val = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu); c->src.val = ops->get_segment_selector(ctxt, VCPU_SREG_CS);
rc = em_push(ctxt); rc = em_push(ctxt);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
...@@ -1537,7 +1537,7 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt, ...@@ -1537,7 +1537,7 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt,
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
ops->get_idt(&dt, ctxt->vcpu); ops->get_idt(ctxt, &dt);
eip_addr = dt.address + (irq << 2); eip_addr = dt.address + (irq << 2);
cs_addr = dt.address + (irq << 2) + 2; cs_addr = dt.address + (irq << 2) + 2;
...@@ -1814,7 +1814,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt, ...@@ -1814,7 +1814,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
struct desc_struct *ss) struct desc_struct *ss)
{ {
memset(cs, 0, sizeof(struct desc_struct)); memset(cs, 0, sizeof(struct desc_struct));
ops->get_cached_descriptor(cs, NULL, VCPU_SREG_CS, ctxt->vcpu); ops->get_cached_descriptor(ctxt, cs, NULL, VCPU_SREG_CS);
memset(ss, 0, sizeof(struct desc_struct)); memset(ss, 0, sizeof(struct desc_struct));
cs->l = 0; /* will be adjusted later */ cs->l = 0; /* will be adjusted later */
...@@ -1861,10 +1861,10 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) ...@@ -1861,10 +1861,10 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
cs.d = 0; cs.d = 0;
cs.l = 1; cs.l = 1;
} }
ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &cs, 0, VCPU_SREG_CS);
ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu); ops->set_segment_selector(ctxt, cs_sel, VCPU_SREG_CS);
ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &ss, 0, VCPU_SREG_SS);
ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu); ops->set_segment_selector(ctxt, ss_sel, VCPU_SREG_SS);
c->regs[VCPU_REGS_RCX] = c->eip; c->regs[VCPU_REGS_RCX] = c->eip;
if (is_long_mode(ctxt->vcpu)) { if (is_long_mode(ctxt->vcpu)) {
...@@ -1933,10 +1933,10 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) ...@@ -1933,10 +1933,10 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
cs.l = 1; cs.l = 1;
} }
ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &cs, 0, VCPU_SREG_CS);
ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu); ops->set_segment_selector(ctxt, cs_sel, VCPU_SREG_CS);
ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &ss, 0, VCPU_SREG_SS);
ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu); ops->set_segment_selector(ctxt, ss_sel, VCPU_SREG_SS);
ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data); ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
c->eip = msr_data; c->eip = msr_data;
...@@ -1990,10 +1990,10 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) ...@@ -1990,10 +1990,10 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
cs_sel |= SELECTOR_RPL_MASK; cs_sel |= SELECTOR_RPL_MASK;
ss_sel |= SELECTOR_RPL_MASK; ss_sel |= SELECTOR_RPL_MASK;
ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &cs, 0, VCPU_SREG_CS);
ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu); ops->set_segment_selector(ctxt, cs_sel, VCPU_SREG_CS);
ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &ss, 0, VCPU_SREG_SS);
ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu); ops->set_segment_selector(ctxt, ss_sel, VCPU_SREG_SS);
c->eip = c->regs[VCPU_REGS_RDX]; c->eip = c->regs[VCPU_REGS_RDX];
c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX]; c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX];
...@@ -2024,7 +2024,7 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt, ...@@ -2024,7 +2024,7 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
unsigned mask = (1 << len) - 1; unsigned mask = (1 << len) - 1;
unsigned long base; unsigned long base;
ops->get_cached_descriptor(&tr_seg, &base3, VCPU_SREG_TR, ctxt->vcpu); ops->get_cached_descriptor(ctxt, &tr_seg, &base3, VCPU_SREG_TR);
if (!tr_seg.p) if (!tr_seg.p)
return false; return false;
if (desc_limit_scaled(&tr_seg) < 103) if (desc_limit_scaled(&tr_seg) < 103)
...@@ -2079,11 +2079,11 @@ static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt, ...@@ -2079,11 +2079,11 @@ static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt,
tss->si = c->regs[VCPU_REGS_RSI]; tss->si = c->regs[VCPU_REGS_RSI];
tss->di = c->regs[VCPU_REGS_RDI]; tss->di = c->regs[VCPU_REGS_RDI];
tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu); tss->es = ops->get_segment_selector(ctxt, VCPU_SREG_ES);
tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu); tss->cs = ops->get_segment_selector(ctxt, VCPU_SREG_CS);
tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu); tss->ss = ops->get_segment_selector(ctxt, VCPU_SREG_SS);
tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu); tss->ds = ops->get_segment_selector(ctxt, VCPU_SREG_DS);
tss->ldt = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu); tss->ldt = ops->get_segment_selector(ctxt, VCPU_SREG_LDTR);
} }
static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt, static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
...@@ -2108,11 +2108,11 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt, ...@@ -2108,11 +2108,11 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
* SDM says that segment selectors are loaded before segment * SDM says that segment selectors are loaded before segment
* descriptors * descriptors
*/ */
ops->set_segment_selector(tss->ldt, VCPU_SREG_LDTR, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ldt, VCPU_SREG_LDTR);
ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
/* /*
* Now load segment descriptors. If fault happenes at this stage * Now load segment descriptors. If fault happenes at this stage
...@@ -2199,13 +2199,13 @@ static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt, ...@@ -2199,13 +2199,13 @@ static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
tss->esi = c->regs[VCPU_REGS_RSI]; tss->esi = c->regs[VCPU_REGS_RSI];
tss->edi = c->regs[VCPU_REGS_RDI]; tss->edi = c->regs[VCPU_REGS_RDI];
tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu); tss->es = ops->get_segment_selector(ctxt, VCPU_SREG_ES);
tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu); tss->cs = ops->get_segment_selector(ctxt, VCPU_SREG_CS);
tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu); tss->ss = ops->get_segment_selector(ctxt, VCPU_SREG_SS);
tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu); tss->ds = ops->get_segment_selector(ctxt, VCPU_SREG_DS);
tss->fs = ops->get_segment_selector(VCPU_SREG_FS, ctxt->vcpu); tss->fs = ops->get_segment_selector(ctxt, VCPU_SREG_FS);
tss->gs = ops->get_segment_selector(VCPU_SREG_GS, ctxt->vcpu); tss->gs = ops->get_segment_selector(ctxt, VCPU_SREG_GS);
tss->ldt_selector = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu); tss->ldt_selector = ops->get_segment_selector(ctxt, VCPU_SREG_LDTR);
} }
static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt, static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
...@@ -2232,13 +2232,13 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt, ...@@ -2232,13 +2232,13 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
* SDM says that segment selectors are loaded before segment * SDM says that segment selectors are loaded before segment
* descriptors * descriptors
*/ */
ops->set_segment_selector(tss->ldt_selector, VCPU_SREG_LDTR, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ldt_selector, VCPU_SREG_LDTR);
ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
ops->set_segment_selector(tss->fs, VCPU_SREG_FS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->fs, VCPU_SREG_FS);
ops->set_segment_selector(tss->gs, VCPU_SREG_GS, ctxt->vcpu); ops->set_segment_selector(ctxt, tss->gs, VCPU_SREG_GS);
/* /*
* Now load segment descriptors. If fault happenes at this stage * Now load segment descriptors. If fault happenes at this stage
...@@ -2320,9 +2320,9 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, ...@@ -2320,9 +2320,9 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
{ {
struct desc_struct curr_tss_desc, next_tss_desc; struct desc_struct curr_tss_desc, next_tss_desc;
int ret; int ret;
u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu); u16 old_tss_sel = ops->get_segment_selector(ctxt, VCPU_SREG_TR);
ulong old_tss_base = ulong old_tss_base =
ops->get_cached_segment_base(VCPU_SREG_TR, ctxt->vcpu); ops->get_cached_segment_base(ctxt, VCPU_SREG_TR);
u32 desc_limit; u32 desc_limit;
/* FIXME: old_tss_base == ~0 ? */ /* FIXME: old_tss_base == ~0 ? */
...@@ -2383,8 +2383,8 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, ...@@ -2383,8 +2383,8 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
} }
ops->set_cr(0, ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu); ops->set_cr(0, ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
ops->set_cached_descriptor(&next_tss_desc, 0, VCPU_SREG_TR, ctxt->vcpu); ops->set_cached_descriptor(ctxt, &next_tss_desc, 0, VCPU_SREG_TR);
ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu); ops->set_segment_selector(ctxt, tss_selector, VCPU_SREG_TR);
if (has_error_code) { if (has_error_code) {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
...@@ -2475,7 +2475,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) ...@@ -2475,7 +2475,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt)
ulong old_eip; ulong old_eip;
int rc; int rc;
old_cs = ctxt->ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu); old_cs = ctxt->ops->get_segment_selector(ctxt, VCPU_SREG_CS);
old_eip = c->eip; old_eip = c->eip;
memcpy(&sel, c->src.valptr + c->op_bytes, 2); memcpy(&sel, c->src.valptr + c->op_bytes, 2);
...@@ -3743,7 +3743,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3743,7 +3743,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
rc = emulate_ud(ctxt); rc = emulate_ud(ctxt);
goto done; goto done;
} }
c->dst.val = ops->get_segment_selector(c->modrm_reg, ctxt->vcpu); c->dst.val = ops->get_segment_selector(ctxt, c->modrm_reg);
break; break;
case 0x8d: /* lea r16/r32, m */ case 0x8d: /* lea r16/r32, m */
c->dst.val = c->src.addr.mem.ea; c->dst.val = c->src.addr.mem.ea;
......
arch/x86/kvm/x86.c
View file @ 4bff1e86
...@@ -4237,28 +4237,29 @@ static int emulator_get_cpl(struct kvm_vcpu *vcpu) ...@@ -4237,28 +4237,29 @@ static int emulator_get_cpl(struct kvm_vcpu *vcpu)
return kvm_x86_ops->get_cpl(vcpu); return kvm_x86_ops->get_cpl(vcpu);
} }
static void emulator_get_gdt(struct desc_ptr *dt, struct kvm_vcpu *vcpu) static void emulator_get_gdt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
{ {
kvm_x86_ops->get_gdt(vcpu, dt); kvm_x86_ops->get_gdt(emul_to_vcpu(ctxt), dt);
} }
static void emulator_get_idt(struct desc_ptr *dt, struct kvm_vcpu *vcpu) static void emulator_get_idt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
{ {
kvm_x86_ops->get_idt(vcpu, dt); kvm_x86_ops->get_idt(emul_to_vcpu(ctxt), dt);
} }
static unsigned long emulator_get_cached_segment_base(int seg, static unsigned long emulator_get_cached_segment_base(
struct kvm_vcpu *vcpu) struct x86_emulate_ctxt *ctxt, int seg)
{ {
return get_segment_base(vcpu, seg); return get_segment_base(emul_to_vcpu(ctxt), seg);
} }
static bool emulator_get_cached_descriptor(struct desc_struct *desc, u32 *base3, static bool emulator_get_cached_descriptor(struct x86_emulate_ctxt *ctxt,
int seg, struct kvm_vcpu *vcpu) struct desc_struct *desc, u32 *base3,
int seg)
{ {
struct kvm_segment var; struct kvm_segment var;
kvm_get_segment(vcpu, &var, seg); kvm_get_segment(emul_to_vcpu(ctxt), &var, seg);
if (var.unusable) if (var.unusable)
return false; return false;
...@@ -4283,9 +4284,11 @@ static bool emulator_get_cached_descriptor(struct desc_struct *desc, u32 *base3, ...@@ -4283,9 +4284,11 @@ static bool emulator_get_cached_descriptor(struct desc_struct *desc, u32 *base3,
return true; return true;
} }
static void emulator_set_cached_descriptor(struct desc_struct *desc, u32 base3, static void emulator_set_cached_descriptor(struct x86_emulate_ctxt *ctxt,
int seg, struct kvm_vcpu *vcpu) struct desc_struct *desc, u32 base3,
int seg)
{ {
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
struct kvm_segment var; struct kvm_segment var;
/* needed to preserve selector */ /* needed to preserve selector */
...@@ -4314,22 +4317,22 @@ static void emulator_set_cached_descriptor(struct desc_struct *desc, u32 base3, ...@@ -4314,22 +4317,22 @@ static void emulator_set_cached_descriptor(struct desc_struct *desc, u32 base3,
return; return;
} }
static u16 emulator_get_segment_selector(int seg, struct kvm_vcpu *vcpu) static u16 emulator_get_segment_selector(struct x86_emulate_ctxt *ctxt, int seg)
{ {
struct kvm_segment kvm_seg; struct kvm_segment kvm_seg;
kvm_get_segment(vcpu, &kvm_seg, seg); kvm_get_segment(emul_to_vcpu(ctxt), &kvm_seg, seg);
return kvm_seg.selector; return kvm_seg.selector;
} }
static void emulator_set_segment_selector(u16 sel, int seg, static void emulator_set_segment_selector(struct x86_emulate_ctxt *ctxt,
struct kvm_vcpu *vcpu) u16 sel, int seg)
{ {
struct kvm_segment kvm_seg; struct kvm_segment kvm_seg;
kvm_get_segment(vcpu, &kvm_seg, seg); kvm_get_segment(emul_to_vcpu(ctxt), &kvm_seg, seg);
kvm_seg.selector = sel; kvm_seg.selector = sel;
kvm_set_segment(vcpu, &kvm_seg, seg); kvm_set_segment(emul_to_vcpu(ctxt), &kvm_seg, seg);
} }
static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt) static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7