xen-changelog

[Top] [All Lists]

[Xen-changelog] Fix x86_64 Xen build.

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Fix x86_64 Xen build.
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Wed, 22 Feb 2006 18:50:10 +0000
Delivery-date:	Wed, 22 Feb 2006 18:50:45 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
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 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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Fix x86_64 Xen build., Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Don't reload segment registers -- it's done later in generic code., Xen patchbot -unstable
Next by Date:	[Xen-changelog] Change shadow_direct_map_init/clean param from vcpu to domain., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Don't reload segment registers -- it's done later in generic code., Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Change shadow_direct_map_init/clean param from vcpu to domain., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]