From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH 1/2] Revert "libxl: fix "xl mem-set" regression from 0c029c4da2" Date: Tue, 23 Jun 2015 10:24:19 -0400 Message-ID: <20150623142419.GD17306@l.oracle.com> References: <1435068984-9163-1-git-send-email-wei.liu2@citrix.com> <1435068984-9163-2-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.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z7P7r-0006Kl-19 for xen-devel@lists.xenproject.org; Tue, 23 Jun 2015 14:24:35 +0000 Content-Disposition: inline In-Reply-To: <1435068984-9163-2-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: Wei Liu Cc: Ian Campbell , Stefano Stabellini , George Dunlap , Andrew Cooper , Ian Jackson , Xen-devel List-Id: xen-devel@lists.xenproject.org On Tue, Jun 23, 2015 at 03:16:23PM +0100, Wei Liu wrote: > This reverts commit f5b43e95facdc17f925cb56a8963cd4531074034. Could you include some detail of why the revert is needed? Thanks. > > Signed-off-by: Wei Liu > --- > tools/libxc/include/xenctrl.h | 2 +- > tools/libxc/xc_domain.c | 2 +- > tools/libxl/libxl.c | 5 ++--- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h > index d1d2ab3..db5d028 100644 > --- a/tools/libxc/include/xenctrl.h > +++ b/tools/libxc/include/xenctrl.h > @@ -1285,7 +1285,7 @@ int xc_getcpuinfo(xc_interface *xch, int max_cpus, > > int xc_domain_setmaxmem(xc_interface *xch, > uint32_t domid, > - uint64_t max_memkb); > + unsigned int max_memkb); > > int xc_domain_set_memmap_limit(xc_interface *xch, > uint32_t domid, > diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c > index ce51e69..5b1a52d 100644 > --- a/tools/libxc/xc_domain.c > +++ b/tools/libxc/xc_domain.c > @@ -635,7 +635,7 @@ int xc_shadow_control(xc_interface *xch, > > int xc_domain_setmaxmem(xc_interface *xch, > uint32_t domid, > - uint64_t max_memkb) > + unsigned int max_memkb) > { > DECLARE_DOMCTL; > domctl.cmd = XEN_DOMCTL_max_mem; > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index d86ea62..35caf42 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -4736,8 +4736,7 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, > { > GC_INIT(ctx); > int rc = 1, abort_transaction = 0; > - uint64_t memorykb; > - uint32_t videoram = 0; > + uint32_t memorykb = 0, videoram = 0; > uint32_t current_target_memkb = 0, new_target_memkb = 0; > uint32_t current_max_memkb = 0; > char *memmax, *endptr, *videoram_s = NULL, *target = NULL; > @@ -4831,7 +4830,7 @@ retry_transaction: > rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); > if (rc != 0) { > LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, > - "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed " > + "xc_domain_setmaxmem domid=%d memkb=%d failed " > "rc=%d\n", domid, memorykb, rc); > abort_transaction = 1; > goto out; > -- > 1.9.1 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel