From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNv-0005u1-96 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSRNq-0000uU-1A for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:35 -0400 Received: from mail-qc0-x22e.google.com ([2607:f8b0:400d:c01::22e]:54987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNp-0000uL-Tx for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:29 -0400 Received: by mail-qc0-f174.google.com with SMTP id m20so718906qcx.19 for ; Fri, 12 Sep 2014 06:59:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 12 Sep 2014 15:58:47 +0200 Message-Id: <1410530338-17615-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> References: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 10/21] exec: report error when memory < hpagesize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao From: Hu Tao 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 Signed-off-by: Paolo Bonzini --- exec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index 2b9c4c5..1100208 100644 --- a/exec.c +++ b/exec.c @@ -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()) { -- 2.1.0