diff options
author | Hu Tao <hutao@cn.fujitsu.com> | 2014-09-09 13:28:00 +0800 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-09 13:41:44 +0200 |
commit | 557529dd600fb0f1fc52e86c9679afa6a9368bc8 (patch) | |
tree | 83a1adc8cecd05384e8adade9481203e4bf1ad92 /exec.c | |
parent | d42e2de7bc0af5ff08143312d4a22c01e7da3da1 (diff) | |
download | qemu-557529dd600fb0f1fc52e86c9679afa6a9368bc8.zip qemu-557529dd600fb0f1fc52e86c9679afa6a9368bc8.tar.gz qemu-557529dd600fb0f1fc52e86c9679afa6a9368bc8.tar.bz2 |
exec: report error when memory < hpagesize
Report an error when memory < hpagesize in file_ram_alloc() so callers
can handle the error.
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)
This patch fixes the problem. With this patch, qemu reports error
message like:
qemu-system-x86_64: -object memory-backend-file,mem-path=/hugepages,id=mem-file0,size=1M: memory
size 0x100000 must be equal to or larger than huge page size 0x200000
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'exec.c')
-rw-r--r-- | exec.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1059,9 +1059,9 @@ static void *file_ram_alloc(RAMBlock *block, char *filename; char *sanitized_name; char *c; - void *area; + void *area = NULL; int fd; - unsigned long hpagesize; + uint64_t hpagesize; hpagesize = gethugepagesize(path); if (!hpagesize) { @@ -1069,7 +1069,10 @@ static void *file_ram_alloc(RAMBlock *block, } if (memory < hpagesize) { - return NULL; + error_setg(errp, "memory size 0x" RAM_ADDR_FMT " must be equal to " + "or larger than huge page size 0x%" PRIx64, + memory, hpagesize); + goto error; } if (kvm_enabled() && !kvm_has_sync_mmu()) { |