mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
d42e2de7bc
commit
557529dd60
9
exec.c
9
exec.c
|
@ -1059,9 +1059,9 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||||
char *filename;
|
char *filename;
|
||||||
char *sanitized_name;
|
char *sanitized_name;
|
||||||
char *c;
|
char *c;
|
||||||
void *area;
|
void *area = NULL;
|
||||||
int fd;
|
int fd;
|
||||||
unsigned long hpagesize;
|
uint64_t hpagesize;
|
||||||
|
|
||||||
hpagesize = gethugepagesize(path);
|
hpagesize = gethugepagesize(path);
|
||||||
if (!hpagesize) {
|
if (!hpagesize) {
|
||||||
|
@ -1069,7 +1069,10 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (memory < hpagesize) {
|
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()) {
|
if (kvm_enabled() && !kvm_has_sync_mmu()) {
|
||||||
|
|
Loading…
Reference in New Issue