[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 5/6] Don't abort on out of memory when creating
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 5/6] Don't abort on out of memory when creating page cache |
Date: |
Thu, 30 Jan 2014 15:48:09 +0000 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
* Orit Wasserman (address@hidden) wrote:
> Signed-off-by: Orit Wasserman <address@hidden>
> ---
> 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 / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH 0/6] XBZRLE Fixes, Orit Wasserman, 2014/01/30
- [Qemu-devel] [PATCH 1/6] Set xbzrle buffers to NULL after freeing them to avoid double free errors, Orit Wasserman, 2014/01/30
- [Qemu-devel] [PATCH 3/6] migration:fix free XBZRLE decoded_buf wrong, Orit Wasserman, 2014/01/30
- [Qemu-devel] [PATCH 2/6] Add check for cache size smaller than page size, Orit Wasserman, 2014/01/30
- [Qemu-devel] [PATCH 4/6] XBZRLE cache size should not be larger than guest memory size, Orit Wasserman, 2014/01/30
- [Qemu-devel] [PATCH 5/6] Don't abort on out of memory when creating page cache, Orit Wasserman, 2014/01/30
- Re: [Qemu-devel] [PATCH 5/6] Don't abort on out of memory when creating page cache,
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH 6/6] Don't abort on memory allocation error, Orit Wasserman, 2014/01/30