@@ -442,7 +442,7 @@ static int hvmemul_linear_to_phys(
}
/* Reverse mode if this is a backwards multi-iteration string operation. */
- reverse = (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1);
+ reverse = (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1);
if ( reverse && ((PAGE_SIZE - offset) < bytes_per_rep) )
{
@@ -539,7 +539,7 @@ static int hvmemul_virtual_to_linear(
if ( IS_ERR(reg) )
return -PTR_ERR(reg);
- if ( (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1) )
+ if ( (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1) )
{
/*
* x86_emulate() clips the repetition count to ensure we don't wrap
@@ -1074,7 +1074,7 @@ static int hvmemul_rep_ins(
return X86EMUL_UNHANDLEABLE;
return hvmemul_do_pio_addr(src_port, reps, bytes_per_rep, IOREQ_READ,
- !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa);
+ !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa);
}
static int hvmemul_rep_outs_set_context(
@@ -1143,7 +1143,7 @@ static int hvmemul_rep_outs(
return X86EMUL_UNHANDLEABLE;
return hvmemul_do_pio_addr(dst_port, reps, bytes_per_rep, IOREQ_WRITE,
- !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa);
+ !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa);
}
static int hvmemul_rep_movs(
@@ -1162,7 +1162,7 @@ static int hvmemul_rep_movs(
paddr_t sgpa, dgpa;
uint32_t pfec = PFEC_page_present;
p2m_type_t sp2mt, dp2mt;
- int rc, df = !!(ctxt->regs->eflags & X86_EFLAGS_DF);
+ int rc, df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF);
char *buf;
rc = hvmemul_virtual_to_linear(
@@ -1316,7 +1316,7 @@ static int hvmemul_rep_stos(
unsigned long addr, bytes;
paddr_t gpa;
p2m_type_t p2mt;
- bool_t df = !!(ctxt->regs->eflags & X86_EFLAGS_DF);
+ bool_t df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF);
int rc = hvmemul_virtual_to_linear(seg, offset, bytes_per_rep, reps,
hvm_access_write, hvmemul_ctxt, &addr);
@@ -1766,7 +1766,7 @@ static int _hvm_emulate_one(struct hvm_e
if ( hvmemul_ctxt->ctxt.retire.hlt &&
!hvm_local_events_need_delivery(curr) )
{
- hvm_hlt(regs->eflags);
+ hvm_hlt(regs->_eflags);
}
return X86EMUL_OKAY;
@@ -1930,7 +1930,7 @@ void hvm_emulate_init_per_insn(
if ( hvmemul_ctxt->seg_reg[x86_seg_ss].attr.fields.dpl == 3 )
pfec |= PFEC_user_mode;
- hvmemul_ctxt->insn_buf_eip = hvmemul_ctxt->ctxt.regs->eip;
+ hvmemul_ctxt->insn_buf_eip = hvmemul_ctxt->ctxt.regs->rip;
if ( !insn_bytes )
{
hvmemul_ctxt->insn_buf_bytes =
@@ -136,7 +136,7 @@ int handle_pio(uint16_t port, unsigned i
ASSERT((size - 1) < 4 && size != 3);
if ( dir == IOREQ_WRITE )
- data = guest_cpu_user_regs()->eax;
+ data = guest_cpu_user_regs()->_eax;
rc = hvmemul_do_pio_buffer(port, size, dir, &data);