# HG changeset patch # User Juergen Gross # Date 1342171241 -7200 # Node ID 0cfc9e2b7da38c2d4f7cd180ddb9fceae6adbc68 # Parent 0d1fbddee973517d24dcc080be93d2e10a42b98f tools: Enable superpages for HVM domains by default Signed-off-by: George Dunlap Signed-off-by: Juergen Gross diff -r 0d1fbddee973 -r 0cfc9e2b7da3 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jul 13 11:20:40 2012 +0200 +++ b/tools/libxl/libxl_dom.c Fri Jul 13 11:20:41 2012 +0200 @@ -308,7 +308,7 @@ int libxl__domain_restore_common(libxl_c 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 0d1fbddee973 -r 0cfc9e2b7da3 tools/python/xen/xend/XendCheckpoint.py --- a/tools/python/xen/xend/XendCheckpoint.py Fri Jul 13 11:20:40 2012 +0200 +++ b/tools/python/xen/xend/XendCheckpoint.py Fri Jul 13 11:20:41 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 0d1fbddee973 -r 0cfc9e2b7da3 tools/xcutils/xc_restore.c --- a/tools/xcutils/xc_restore.c Fri Jul 13 11:20:40 2012 +0200 +++ b/tools/xcutils/xc_restore.c Fri Jul 13 11:20:41 2012 +0200 @@ -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);