Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197627
b: refs/heads/master
c: 83bf000
h: refs/heads/master
i:
  197625: 24643e6
  197623: cc908da
v: v3
  • Loading branch information
Jan Kiszka authored and Avi Kivity committed Apr 25, 2010
1 parent 4dfae1e commit e0be057
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c310bac5a20fc37f761bd7297ba2e52cf40d79c6
refs/heads/master: 83bf0002c91b65744db78df36d4f1af27bd9099b
4 changes: 2 additions & 2 deletions trunk/arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -3447,7 +3447,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);

vcpu->arch.emulate_ctxt.vcpu = vcpu;
vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);
vcpu->arch.emulate_ctxt.eflags = kvm_x86_ops->get_rflags(vcpu);
vcpu->arch.emulate_ctxt.mode =
(!is_protmode(vcpu)) ? X86EMUL_MODE_REAL :
(vcpu->arch.emulate_ctxt.eflags & X86_EFLAGS_VM)
Expand Down Expand Up @@ -3526,7 +3526,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
return EMULATE_DO_MMIO;
}

kvm_set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);

if (vcpu->mmio_is_write) {
vcpu->mmio_needed = 0;
Expand Down

0 comments on commit e0be057

Please sign in to comment.