From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1k0X-0003aS-It for qemu-devel@nongnu.org; Tue, 01 Nov 2016 21:06:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1k0S-0006YJ-9M for qemu-devel@nongnu.org; Tue, 01 Nov 2016 21:06:25 -0400 Received: from mga05.intel.com ([192.55.52.43]:40691) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c1k0S-0006Xw-1q for qemu-devel@nongnu.org; Tue, 01 Nov 2016 21:06:20 -0400 From: Haozhong Zhang Date: Wed, 2 Nov 2016 09:05:51 +0800 Message-Id: <20161102010551.2723-1-haozhong.zhang@intel.com> In-Reply-To: <20161027042300.5929-3-haozhong.zhang@intel.com> References: <20161027042300.5929-3-haozhong.zhang@intel.com> Subject: [Qemu-devel] [RESEND PATCH v2 2/3] exec.c: check memory backend file size with 'size' option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , Eduardo Habkost Cc: qemu-devel@nongnu.org, Igor Mammedov , Peter Crosthwaite , Richard Henderson , Haozhong Zhang If the memory backend file is not large enough to hold the required 'size', Qemu will report error and exit. Signed-off-by: Haozhong Zhang Message-Id: <20161027042300.5929-3-haozhong.zhang@intel.com> Reviewed-by: Eduardo Habkost --- Changes in RESEND: * Use format string RAM_ADDR_FMT for variable 'memory'. This change is to fix the build error. * Add Eduardo's r-b. * Add the message id of this thread. --- exec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exec.c b/exec.c index a2b371a..23c21c2 100644 --- a/exec.c +++ b/exec.c @@ -1316,6 +1316,13 @@ static void *file_ram_alloc(RAMBlock *block, goto error; } + if (file_size > 0 && file_size < memory) { + error_setg(errp, "backing store %s size 0x%" PRIx64 + " does not match 'size' option 0x" RAM_ADDR_FMT, + path, file_size, memory); + goto error; + } + memory = ROUND_UP(memory, block->page_size); /* -- 2.10.1