[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error hand
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling |
Date: |
Thu, 3 Jul 2014 14:10:56 +0800 |
This patch fixes two problems of memory-backend-file:
1. If user adds a memory-backend-file object using object_add command,
specifying a non-existing directory for property mem-path, qemu
will core dump with message:
/nonexistingdir: No such file or directory
Bad ram offset fffffffffffff000
Aborted (core dumped)
2. If user adds a memory-backend-file object using object_add command,
specifying a size that is less than huge page size, qemu
will core dump with message:
Bad ram offset fffffffffffff000
Aborted (core dumped)
Signed-off-by: Hu Tao <address@hidden>
---
exec.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/exec.c b/exec.c
index 8c2a91d..35c2dcb 100644
--- a/exec.c
+++ b/exec.c
@@ -996,7 +996,7 @@ void qemu_mutex_unlock_ramlist(void)
#define HUGETLBFS_MAGIC 0x958458f6
-static long gethugepagesize(const char *path)
+static long gethugepagesize(const char *path, Error **errp)
{
struct statfs fs;
int ret;
@@ -1006,7 +1006,7 @@ static long gethugepagesize(const char *path)
} while (ret != 0 && errno == EINTR);
if (ret != 0) {
- perror(path);
+ error_setg_errno(errp, errno, "failed to stat file %s", path);
return 0;
}
@@ -1024,17 +1024,19 @@ static void *file_ram_alloc(RAMBlock *block,
char *filename;
char *sanitized_name;
char *c;
- void *area;
+ void *area = NULL;
int fd;
unsigned long hpagesize;
- hpagesize = gethugepagesize(path);
+ hpagesize = gethugepagesize(path, errp);
if (!hpagesize) {
goto error;
}
if (memory < hpagesize) {
- return NULL;
+ error_setg(errp, "memory size 0x" RAM_ADDR_FMT " should be larger "
+ "than huge page size 0x%" PRIx64, memory, hpagesize);
+ goto error;
}
if (kvm_enabled() && !kvm_has_sync_mmu()) {
@@ -1094,8 +1096,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 for 2.1 0/2] bug fixs for memory backend, Hu Tao, 2014/07/03
- [Qemu-devel] [PATCH for 2.1 1/2] memory: introduce memory_region_init_ram_nofail() and memory_region_init_ram_ptr_nofail(), Hu Tao, 2014/07/03
- [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling,
Hu Tao <=
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Eric Blake, 2014/07/03
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Hu Tao, 2014/07/03
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Eric Blake, 2014/07/04
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Hu Tao, 2014/07/04
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Paolo Bonzini, 2014/07/04
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Michael S. Tsirkin, 2014/07/06
- Re: [Qemu-devel] [PATCH for 2.1 2/2] memory-backend-file: improve error handling, Hu Tao, 2014/07/06