From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8tqq-0006uR-0i for qemu-devel@nongnu.org; Thu, 30 Jan 2014 10:48:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8tqk-0000Q0-3F for qemu-devel@nongnu.org; Thu, 30 Jan 2014 10:48:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8tqj-0000Pu-RA for qemu-devel@nongnu.org; Thu, 30 Jan 2014 10:48:18 -0500 Date: Thu, 30 Jan 2014 15:48:09 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20140130154809.GB2655@work-vm> References: <1391066055-17024-1-git-send-email-owasserm@redhat.com> <1391066055-17024-6-git-send-email-owasserm@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1391066055-17024-6-git-send-email-owasserm@redhat.com> Subject: Re: [Qemu-devel] [PATCH 5/6] Don't abort on out of memory when creating page cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Orit Wasserman Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, anthony@codemonkey.ws, quintela@redhat.com * Orit Wasserman (owasserm@redhat.com) wrote: > Signed-off-by: Orit Wasserman > --- > arch_init.c | 16 ++++++++++++++-- > page_cache.c | 18 ++++++++++++++---- > 2 files changed, 28 insertions(+), 6 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 5eff80b..806d096 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -664,8 +664,20 @@ static int ram_save_setup(QEMUFile *f, void *opaque) > DPRINTF("Error creating cache\n"); > return -1; > } > - XBZRLE.encoded_buf = g_malloc0(TARGET_PAGE_SIZE); > - XBZRLE.current_buf = g_malloc(TARGET_PAGE_SIZE); > + > + /* We prefer not to abort if there is no memory */ > + XBZRLE.encoded_buf = g_try_malloc0(TARGET_PAGE_SIZE); > + if (!XBZRLE.encoded_buf) { > + DPRINTF("Error allocating encoded_buf\n"); > + return -1; > + } > + > + XBZRLE.current_buf = g_try_malloc(TARGET_PAGE_SIZE); > + if (!XBZRLE.current_buf) { > + DPRINTF("Error allocating current_buf\n"); > + return -1; > + } Would it be best to free encoded_buf in this second exit case? Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK