xen-changelog

[Top] [All Lists]

[Xen-changelog] Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b5

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 03 May 2006 14:38:10 +0000
Delivery-date:	Wed, 03 May 2006 07:39:47 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 915d5af5dc18f40f9ae9ac160263edb214ab0b0e
# Parent  40cd49c88d691d3c33c4bafb136055c5700aca00
Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 40cd49c88d69 -r 915d5af5dc18 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Wed May 03 11:02:30 2006 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Wed May 03 13:33:01 2006 +0100
@@ -550,7 +550,7 @@ void vmx_load_cpu_guest_regs(struct vcpu
         __vm_set_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
     else
         __vm_clear_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
-    if (regs->rflags & EF_VM)
+    if (regs->eflags & EF_VM)
         fixup_vm86_seg_bases(regs);
 
     __vmwrite(GUEST_CS_SELECTOR, regs->cs);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b, Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Instead of knowing explicitly about the pygrub entry option, allow, Xen patchbot -unstable
Next by Date:	[Xen-changelog] Fix xenbus userspace device transaction tracking., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Instead of knowing explicitly about the pygrub entry option, allow, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Fix xenbus userspace device transaction tracking., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]