ia64/xen-unstable

changeset 9927:915d5af5dc18

Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 03 13:33:01 2006 +0100 (2006-05-03)
parents 40cd49c88d69
children bbce4d115189
files xen/arch/x86/hvm/vmx/vmx.c
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Wed May 03 11:02:30 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Wed May 03 13:33:01 2006 +0100
     1.3 @@ -550,7 +550,7 @@ void vmx_load_cpu_guest_regs(struct vcpu
     1.4          __vm_set_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
     1.5      else
     1.6          __vm_clear_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
     1.7 -    if (regs->rflags & EF_VM)
     1.8 +    if (regs->eflags & EF_VM)
     1.9          fixup_vm86_seg_bases(regs);
    1.10  
    1.11      __vmwrite(GUEST_CS_SELECTOR, regs->cs);