Skip to content

Commit

Permalink
KVM: x86 emulator: Use load_segment_descriptor() instead of kvm_load_…
Browse files Browse the repository at this point in the history 
…segment_descriptor()

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Gleb Natapov authored and Avi Kivity committed May 17, 2010
1 parent 38ba30b commit 2e87302
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/x86/kvm/emulate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
if (rc != X86EMUL_CONTINUE)
return rc;

rc = kvm_load_segment_descriptor(ctxt->vcpu, (u16)selector, seg);
rc = load_segment_descriptor(ctxt, ops, (u16)selector, seg);
return rc;
}

Expand Down Expand Up @@ -1683,7 +1683,7 @@ static int emulate_ret_far(struct x86_emulate_ctxt *ctxt,
rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
if (rc != X86EMUL_CONTINUE)
return rc;
rc = kvm_load_segment_descriptor(ctxt->vcpu, (u16)cs, VCPU_SREG_CS);
rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
return rc;
}

Expand Down Expand Up @@ -2717,7 +2717,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
if (c->modrm_reg == VCPU_SREG_SS)
toggle_interruptibility(ctxt, KVM_X86_SHADOW_INT_MOV_SS);

rc = kvm_load_segment_descriptor(ctxt->vcpu, sel, c->modrm_reg);
rc = load_segment_descriptor(ctxt, ops, sel, c->modrm_reg);

c->dst.type = OP_NONE; /* Disable writeback. */
break;
Expand Down Expand Up @@ -2892,8 +2892,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
goto jmp;
case 0xea: /* jmp far */
jump_far:
if (kvm_load_segment_descriptor(ctxt->vcpu, c->src2.val,
VCPU_SREG_CS))
if (load_segment_descriptor(ctxt, ops, c->src2.val,
VCPU_SREG_CS))
goto done;

c->eip = c->src.val;
Expand Down

0 comments on commit 2e87302

Please sign in to comment.