From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH Remus v2 01/10] tools/libxc: adjust the memory allocation for migration Date: Fri, 8 May 2015 10:51:53 +0100 Message-ID: <554C8739.9060303@citrix.com> References: <1431077610-3366-1-git-send-email-yanghy@cn.fujitsu.com> <1431077610-3366-2-git-send-email-yanghy@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1431077610-3366-2-git-send-email-yanghy@cn.fujitsu.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: Yang Hongyang , xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, wency@cn.fujitsu.com, ian.jackson@eu.citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, rshriram@cs.ubc.ca List-Id: xen-devel@lists.xenproject.org On 08/05/15 10:33, Yang Hongyang wrote: > @@ -475,24 +475,12 @@ static int update_progress_string(struct xc_sr_context *ctx, > static int send_domain_memory_live(struct xc_sr_context *ctx) > { > xc_interface *xch = ctx->xch; > - DECLARE_HYPERCALL_BUFFER(unsigned long, to_send); > xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; > char *progress_str = NULL; > unsigned x; > int rc = -1; > - > - to_send = xc_hypercall_buffer_alloc_pages( > - xch, to_send, NRPAGES(bitmap_size(ctx->save.p2m_size))); > - > - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * > - sizeof(*ctx->save.batch_pfns)); > - ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); > - > - if ( !ctx->save.batch_pfns || !to_send || !ctx->save.deferred_pages ) > - { > - ERROR("Unable to allocate memory for to_{send,fix}/batch bitmaps"); > - goto out; > - } > + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, > + (&ctx->save.dirty_bitmap_hbuf)); Nice bug. I have just put a fix to DECLARE_HYPERCALL_BUFFER_SHADOW() in my series. ~Andrew