From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Zhai, Edwin" <edwin.zhai@intel.com>
Subject: [PATCH][HVM] fix save/restore on 64b HV
Date: Tue, 23 Jan 2007 23:14:33 +0800
Message-ID: <20070123151433.GA30643@edwin-gen.sh.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
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>, Tim Deegan <Tim.Deegan@xensource.com>
Cc: xen-devel@lists.xensource.com, edwin.zhai@intel.com
List-Id: xen-devel@lists.xenproject.org

[PATCH][HVM] fix save/restore on 64b HV

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

enable hvm_ctxt ops for compat mode to fix HVM save/restore on 64b HV

diff -r b75af612851c xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c	Mon Jan 22 17:31:15 2007 +0000
+++ b/xen/arch/x86/domctl.c	Tue Jan 23 22:00:11 2007 +0800
@@ -311,12 +311,16 @@ _long arch_do_domctl(
         
         ret = -EFAULT;
 
-#ifndef CONFIG_COMPAT
+#ifndef COMPAT
         if ( copy_from_guest(c, domctl->u.hvmcontext.ctxt, 1) != 0 )
+#else
+        if ( copy_from_guest(c,
+                             compat_handle_cast(domctl->u.hvmcontext.ctxt, void),
+                             1) != 0 )
+#endif
             goto sethvmcontext_out;
 
         ret = arch_sethvm_ctxt(v, c);
-#endif
 
         xfree(c);
 
@@ -350,12 +354,16 @@ _long arch_do_domctl(
         if (arch_gethvm_ctxt(v, c) == -1)
             ret = -EFAULT;
 
-#ifndef CONFIG_COMPAT
+#ifndef COMPAT
         if ( copy_to_guest(domctl->u.hvmcontext.ctxt, c, 1) )
+#else
+        if ( copy_to_guest(compat_handle_cast(domctl->u.hvmcontext.ctxt,
+                                              void),
+                           c, 1) )
             ret = -EFAULT;
+#endif
 
         xfree(c);
-#endif
 
         if ( copy_to_guest(u_domctl, domctl, 1) )
             ret = -EFAULT;