From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jean Guyader <jean.guyader@eu.citrix.com>
Subject: [PATCH] compilation fix for x86_64 caused by
	17880:d3a87899985d
Date: Fri, 20 Jun 2008 11:01:27 +0100
Message-ID: <485B7FF7.2040409@eu.citrix.com>
References: <485A6742.6040806@eu.citrix.com> <485A7404.8030702@eu.citrix.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------050300000100060908010102"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <485A7404.8030702@eu.citrix.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------050300000100060908010102
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit


   Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>

-- 
Jean Guyader

--------------050300000100060908010102
Content-Type: text/plain;
 name="vcpu_guest_context_any_t_x86_64.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="vcpu_guest_context_any_t_x86_64.patch"

diff -r d3a87899985d tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c	Thu Jun 19 16:15:05 2008 +0100
+++ b/tools/libxc/xc_ptrace.c	Fri Jun 20 10:59:17 2008 +0100
@@ -264,12 +264,12 @@ map_domain_va_64(
     uint64_t *l4, *l3, *l2, *l1;
     static void *v[MAX_VIRT_CPUS];
 
-    if ((ctxt[cpu].ctrlreg[4] & 0x20) == 0 ) /* legacy ia32 mode */
+    if ((ctxt[cpu].c.ctrlreg[4] & 0x20) == 0 ) /* legacy ia32 mode */
         return map_domain_va_32(xc_handle, cpu, guest_va, perm);
 
     l4 = xc_map_foreign_range(
         xc_handle, current_domid, PAGE_SIZE, PROT_READ,
-        xen_cr3_to_pfn(ctxt[cpu].ctrlreg[3]));
+        xen_cr3_to_pfn(ctxt[cpu].c.ctrlreg[3]));
     if ( l4 == NULL )
         return NULL;
 
diff -r d3a87899985d tools/xentrace/xenctx.c
--- a/tools/xentrace/xenctx.c	Thu Jun 19 16:15:05 2008 +0100
+++ b/tools/xentrace/xenctx.c	Fri Jun 20 10:59:17 2008 +0100
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
-#include <xen/foreign/x86_64.h>
-#include <xen/foreign/x86_32.h>
 
 #include "xenctrl.h"
 

--------------050300000100060908010102
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------050300000100060908010102--