[Xen-changelog] Fix getdomaininfo for vmx guests.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f972da9a2dda8a0ac844a6a4f683c1e0974cb227
# Parent  01e223b2a3501d64e44f009c01590d3b257dd90b
Fix getdomaininfo for vmx guests.
Replaces Intel patch [14/15].
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 01e223b2a350 -r f972da9a2dda xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   Thu Aug 11 21:09:06 2005
+++ b/xen/arch/x86/dom0_ops.c   Thu Aug 11 21:19:45 2005
@@ -404,15 +404,17 @@
 
     memcpy(c, &v->arch.guest_context, sizeof(*c));
 
-    /* IOPL privileges are virtualised -- merge back into returned eflags. */
-    BUG_ON((c->user_regs.eflags & EF_IOPL) != 0);
-    c->user_regs.eflags |= v->arch.iopl << 12;
-
     if ( VMX_DOMAIN(v) )
     {
         save_vmx_cpu_user_regs(&c->user_regs);
         __vmread(CR0_READ_SHADOW, &c->ctrlreg[0]);
         __vmread(CR4_READ_SHADOW, &c->ctrlreg[4]);
+    }
+    else
+    {
+        /* IOPL privileges are virtualised: merge back into returned eflags. */
+        BUG_ON((c->user_regs.eflags & EF_IOPL) != 0);
+        c->user_regs.eflags |= v->arch.iopl << 12;
     }
 
     c->flags = 0;

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