# HG changeset patch
# User Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
# Date 1342171665 -7200
# Node ID 1d7a98073b7dc12542cf2e31e93462ad735b306d
# Parent  7bf9266bc106acaedd3c2cf70f7040e48be96bbb
xen 4.0: tools: Enable superpages for HVM domains by default

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Signed-off-by: Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>

diff -r 7bf9266bc106 -r 1d7a98073b7d tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c	Fri Jul 13 11:27:44 2012 +0200
+++ b/tools/libxl/libxl_dom.c	Fri Jul 13 11:27:45 2012 +0200
@@ -192,7 +192,7 @@ int restore_common(struct libxl_ctx *ctx
     return xc_domain_restore(ctx->xch, fd, domid,
                              state->store_port, &state->store_mfn,
                              state->console_port, &state->console_mfn,
-                             info->hvm, info->u.hvm.pae, 0);
+                             info->hvm, info->u.hvm.pae, !!info->hvm);
 }
 
 struct suspendinfo {
diff -r 7bf9266bc106 -r 1d7a98073b7d tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py	Fri Jul 13 11:27:44 2012 +0200
+++ b/tools/python/xen/xend/XendCheckpoint.py	Fri Jul 13 11:27:45 2012 +0200
@@ -298,6 +298,8 @@ def restore(xd, fd, dominfo = None, paus
         dominfo.info['shadow_memory'] = shadow_cur
 
         superpages = restore_image.superpages
+        if is_hvm:
+            superpages = 1
 
         cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE),
                         fd, dominfo.getDomid(),
diff -r 7bf9266bc106 -r 1d7a98073b7d tools/xcutils/xc_restore.c
--- a/tools/xcutils/xc_restore.c	Fri Jul 13 11:27:44 2012 +0200
+++ b/tools/xcutils/xc_restore.c	Fri Jul 13 11:27:45 2012 +0200
@@ -42,7 +42,7 @@ main(int argc, char **argv)
     if ( argc == 9 )
 	    superpages = atoi(argv[8]);
     else
-	    superpages = 0;
+	    superpages = !!hvm;
 
     ret = xc_domain_restore(xc_fd, io_fd, domid, store_evtchn, &store_mfn,
                             console_evtchn, &console_mfn, hvm, pae, superpages);