[Xen-changelog] Fix x86_64 Xen build.

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

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID 8946b6dcd49e017bc51f2a535c2aa83d54bbf1e6
# Parent  ed274ca1fbb7b0b0a5c1b8733962e5831835928c
Fix x86_64 Xen build.

event_callback_cs and failsafe_callback_cs are x86_32 only.

Signed-off-by: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>

diff -r ed274ca1fbb7 -r 8946b6dcd49e xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     Wed Feb 22 15:50:28 2006
+++ b/xen/arch/x86/domain.c     Wed Feb 22 17:26:39 2006
@@ -357,10 +357,14 @@
     if ( !(c->flags & VGCF_HVM_GUEST) )
     {
         if ( ((c->user_regs.ss & 3) == 0) ||
-             !VALID_CODESEL(c->user_regs.cs) ||
-             !VALID_CODESEL(c->event_callback_cs) ||
+             !VALID_CODESEL(c->user_regs.cs) )
+            return -EINVAL;
+
+#ifdef __i386__
+        if ( !VALID_CODESEL(c->event_callback_cs) ||
              !VALID_CODESEL(c->failsafe_callback_cs) )
             return -EINVAL;
+#endif
 
         for ( i = 0; i < 256; i++ )
             if ( !VALID_CODESEL(c->trap_ctxt[i].cs) )

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