From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@eu.citrix.com>
Subject: [PATCH 4 of 4] tools: Enable superpages for HVM domains
	by default
Date: Mon, 16 May 2011 11:51:06 +0100
Message-ID: <454501a505041f7460ad.1305543066@elijah>
References: <patchbomb.1305543062@elijah>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1305543062@elijah>
List-Unsubscribe: <http://lists.xensource.com/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/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
Cc: george.dunlap@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

diff -r 2ee1b330f2d3 -r 454501a50504 tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c	Mon May 16 11:50:46 2011 +0100
+++ b/tools/libxl/libxl_dom.c	Mon May 16 11:50:46 2011 +0100
@@ -316,7 +316,7 @@ int libxl__domain_restore_common(libxl__
     rc = 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);
     if ( rc ) {
         LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "restoring domain");
         return ERROR_FAIL;
diff -r 2ee1b330f2d3 -r 454501a50504 tools/xcutils/xc_restore.c
--- a/tools/xcutils/xc_restore.c	Mon May 16 11:50:46 2011 +0100
+++ b/tools/xcutils/xc_restore.c	Mon May 16 11:50:46 2011 +0100
@@ -43,7 +43,7 @@ main(int argc, char **argv)
     if ( argc == 9 )
 	    superpages = atoi(argv[8]);
     else
-	    superpages = 0;
+	    superpages = !!hvm;
 
     ret = xc_domain_restore(xch, io_fd, domid, store_evtchn, &store_mfn,
                             console_evtchn, &console_mfn, hvm, pae, superpages);