[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 8/8] exec: add parameter errp to gethugepagesize
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v7 8/8] exec: add parameter errp to gethugepagesize |
Date: |
Fri, 15 Aug 2014 18:07:26 +0800 |
Add parameter errp to gethugepagesize thus callers can handle errors.
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)
This patch fixes the problem. With this patch, qemu reports an error
message like:
qemu-system-x86_64: -object
memory-backend-file,mem-path=/nonexistingdir,id=mem-file0,size=128M:
failed to get page size of file /nonexistingdir: No such file or directory
Signed-off-by: Hu Tao <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
exec.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/exec.c b/exec.c
index ed59f3c..5f54049 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,8 @@ static long gethugepagesize(const char *path)
} while (ret != 0 && errno == EINTR);
if (ret != 0) {
- perror(path);
+ error_setg_errno(errp, errno, "failed to get page size of file %s",
+ path);
return 0;
}
@@ -1027,9 +1028,11 @@ static void *file_ram_alloc(RAMBlock *block,
void *area = NULL;
int fd;
uint64_t hpagesize;
+ Error *local_err = NULL;
- hpagesize = gethugepagesize(path);
- if (!hpagesize) {
+ hpagesize = gethugepagesize(path, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
goto error;
}
--
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, 2014/08/15
- [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 <=
- Re: [Qemu-devel] [PATCH v7 0/8] memory API improvements and bug fixes for memory backends, Hu Tao, 2014/08/27