diff options
| author | Gleb Natapov | 2010-04-28 18:15:40 +0200 |
|---|---|---|
| committer | Avi Kivity | 2010-08-01 09:35:35 +0200 |
| commit | ef050dc0390176ec6888f373edb776587c88be3d (patch) | |
| tree | 1e205bbfa3d64385889e976181b086bf3618837e /arch/x86/kvm/x86.c | |
| parent | KVM: x86 emulator: advance RIP outside x86 emulator code (diff) | |
| download | kernel-qcow2-linux-ef050dc0390176ec6888f373edb776587c88be3d.tar.gz kernel-qcow2-linux-ef050dc0390176ec6888f373edb776587c88be3d.tar.xz kernel-qcow2-linux-ef050dc0390176ec6888f373edb776587c88be3d.zip | |
KVM: x86 emulator: set RFLAGS outside x86 emulator code
Removes the need for set_flags() callback.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8f45cc712dda..04ca343ee512 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3806,11 +3806,6 @@ static void emulator_set_segment_selector(u16 sel, int seg, kvm_set_segment(vcpu, &kvm_seg, seg); } -static void emulator_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags) -{ - kvm_x86_ops->set_rflags(vcpu, rflags); -} - static struct x86_emulate_ops emulate_ops = { .read_std = kvm_read_guest_virt_system, .write_std = kvm_write_guest_virt_system, @@ -3829,7 +3824,6 @@ static struct x86_emulate_ops emulate_ops = { .get_cr = emulator_get_cr, .set_cr = emulator_set_cr, .cpl = emulator_get_cpl, - .set_rflags = emulator_set_rflags, .get_dr = emulator_get_dr, .set_dr = emulator_set_dr, .set_msr = kvm_set_msr, @@ -3941,6 +3935,7 @@ restart: shadow_mask = vcpu->arch.emulate_ctxt.interruptibility; kvm_x86_ops->set_interrupt_shadow(vcpu, shadow_mask); + kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags); kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip); if (vcpu->arch.pio.count) { |