Index: 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c
===================================================================
--- 2007-05-14.orig/xen/arch/x86/hvm/vmx/vmx.c	2007-07-02 12:03:02.000000000 +0200
+++ 2007-05-14/xen/arch/x86/hvm/vmx/vmx.c	2007-07-02 12:03:13.000000000 +0200
@@ -1521,15 +1521,15 @@ static int vmx_check_descriptor(int long
         limit_field = GUEST_FS_LIMIT;
         break;
     case x86_seg_gs:
-        ar_field = GUEST_FS_AR_BYTES;
-        base_field = GUEST_FS_BASE;
-        limit_field = GUEST_FS_LIMIT;
-        break;
-    case x86_seg_ss:
         ar_field = GUEST_GS_AR_BYTES;
         base_field = GUEST_GS_BASE;
         limit_field = GUEST_GS_LIMIT;
         break;
+    case x86_seg_ss:
+        ar_field = GUEST_SS_AR_BYTES;
+        base_field = GUEST_SS_BASE;
+        limit_field = GUEST_SS_LIMIT;
+        break;
     default:
         BUG();
         return 0;