From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 2/2] Revert "libxl_set_memory_target: retain the same maxmem offset on top of the current target" Date: Tue, 23 Jun 2015 15:16:24 +0100 Message-ID: <1435068984-9163-3-git-send-email-wei.liu2@citrix.com> References: <1435068984-9163-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7P1v-000564-EH for xen-devel@lists.xenproject.org; Tue, 23 Jun 2015 14:18:27 +0000 In-Reply-To: <1435068984-9163-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Campbell , Stefano Stabellini , George Dunlap , Andrew Cooper , Ian Jackson List-Id: xen-devel@lists.xenproject.org This reverts commit 0c029c4da2169159064568ef4fea862a5d2cd84a. Signed-off-by: Wei Liu --- tools/libxl/libxl.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 35caf42..e3e63b5 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4741,16 +4741,11 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); + xc_domaininfo_t info; libxl_dominfo ptr; char *uuid; xs_transaction_t t; - libxl_dominfo_init(&ptr); - if (libxl_domain_info(ctx, &ptr, domid) < 0) - goto out_no_transaction; - - uuid = libxl__uuid2string(gc, ptr.uuid); - retry_transaction: t = xs_transaction_start(ctx->xsh); @@ -4826,12 +4821,13 @@ retry_transaction: } if (enforce) { - memorykb = ptr.max_memkb - current_target_memkb + new_target_memkb; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); + memorykb = new_target_memkb + videoram; + rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + + LIBXL_MAXMEM_CONSTANT); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_setmaxmem domid=%d memkb=%d failed " - "rc=%d\n", domid, memorykb, rc); + "rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, rc); abort_transaction = 1; goto out; } @@ -4850,9 +4846,18 @@ retry_transaction: libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath), "%"PRIu32, new_target_memkb); + rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); + if (rc != 1 || info.domain != domid) { + abort_transaction = 1; + goto out; + } + libxl_dominfo_init(&ptr); + xcinfo2xlinfo(ctx, &info, &ptr); + uuid = libxl__uuid2string(gc, ptr.uuid); libxl__xs_write(gc, t, libxl__sprintf(gc, "/vm/%s/memory", uuid), "%"PRIu32, new_target_memkb / 1024); + libxl_dominfo_dispose(&ptr); out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) @@ -4861,7 +4866,6 @@ out: goto retry_transaction; out_no_transaction: - libxl_dominfo_dispose(&ptr); GC_FREE; return rc; } -- 1.9.1