From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH] libxc-x86-64-fixes.patch
Date: Tue, 29 Mar 2005 15:33:03 -0800
Message-ID: <20050329233303.GA409@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
Resent-To: xen-devel@lists.xensource.com
Resent-Message-Id: <20050330012303.6F2B0E13D3@los-vmm.sc.intel.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: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Build fixes for x86-64.

Signed-off-by: Nitin Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

--- 1.4/tools/libxc/xc_ptrace.c	2005-03-20 07:07:46 -08:00
+++ edited/libxc/xc_ptrace.c	2005-03-29 15:18:27 -08:00
@@ -281,9 +281,9 @@
 		SET_PT_REGS(pt, ctxt.cpu_ctxt); 
 		memcpy(data, &pt, sizeof(elf_gregset_t));
 	} else if (request == PTRACE_GETFPREGS)
-	    memcpy(data, &ctxt.fpu_ctxt, sizeof(elf_fpregset_t));
+	    memcpy(data, &ctxt.fpu_ctxt, sizeof(ctxt.fpu_ctxt));
 	else /*if (request == PTRACE_GETFPXREGS)*/
-	    memcpy(data, &ctxt.fpu_ctxt, sizeof(elf_fpxregset_t));
+	    memcpy(data, &ctxt.fpu_ctxt, sizeof(ctxt.fpu_ctxt));
 	cr3 = ctxt.pt_base;
 	regs_valid = 1;
 	break;
--- 1.14/tools/libxc/xc_vmx_build.c	2005-03-20 03:53:25 -08:00
+++ edited/libxc/xc_vmx_build.c	2005-03-29 15:20:56 -08:00
@@ -478,10 +478,18 @@
 {
     int eax, ecx;
 
+#ifdef __i386__
     __asm__ __volatile__ ("pushl %%ebx; cpuid; popl %%ebx" 
 			  : "=a" (eax), "=c" (ecx) 
 			  : "0" (1) 
 			  : "dx");
+#elif defined __x86_64__
+    __asm__ __volatile__ ("pushq %%rbx; cpuid; popq %%rbx"
+                          : "=a" (eax), "=c" (ecx)
+                          : "0" (1)
+                          : "dx");
+#endif
+
     if (!(ecx & VMX_FEATURE_FLAG)) {
         return -1;
     }