[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 6/8] exec: file_ram_alloc: don't exit if failed t
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v7 6/8] exec: file_ram_alloc: don't exit if failed to preallocate memory |
Date: |
Fri, 15 Aug 2014 18:07:24 +0800 |
When using monitor command object_add to add a memory backend file
but failed to preallocate memory for it, qemu exits silently. In
the case we'd better give an error message and keep guest running.
The problem can be reproduced as follows:
1. run qemu with -mem-prealloc
2. (monitor)object_add
memory-backend-file,size=100000G,mem-path=/hugepages,id=mem-file0
Signed-off-by: Hu Tao <address@hidden>
---
exec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index 787cc7a..c361752 100644
--- a/exec.c
+++ b/exec.c
@@ -1094,8 +1094,8 @@ static void *file_ram_alloc(RAMBlock *block,
return area;
error:
- if (mem_prealloc) {
- exit(1);
+ if (area && area != MAP_FAILED) {
+ munmap(area, memory);
}
return NULL;
}
--
1.9.3
- [Qemu-devel] [PATCH v7 0/8] memory API improvements and bug fixes for memory backends, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 1/8] exec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 2/8] memory: add parameter errp to memory_region_init_ram, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 3/8] memory: add parameter errp to memory_region_init_ram_ptr, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 4/8] memory: add parameter errp to memory_region_init_rom_device, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 5/8] hostmem-ram: don't exit qemu if size of memory-backend-ram is way too big, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 6/8] exec: file_ram_alloc: don't exit if failed to preallocate memory,
Hu Tao <=
- [Qemu-devel] [PATCH v7 7/8] exec: report error when memory < hpagesize, Hu Tao, 2014/08/15
- [Qemu-devel] [PATCH v7 8/8] exec: add parameter errp to gethugepagesize, Hu Tao, 2014/08/15
- Re: [Qemu-devel] [PATCH v7 0/8] memory API improvements and bug fixes for memory backends, Hu Tao, 2014/08/27