From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Fm1-00008C-Li for qemu-devel@nongnu.org; Tue, 14 Aug 2012 07:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Fm0-0003B4-Jy for qemu-devel@nongnu.org; Tue, 14 Aug 2012 07:59:01 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:60657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Fm0-0003Ak-DT for qemu-devel@nongnu.org; Tue, 14 Aug 2012 07:59:00 -0400 From: Markus Armbruster Date: Tue, 14 Aug 2012 13:58:54 +0200 Message-Id: <1344945535-2774-2-git-send-email-armbru@redhat.com> In-Reply-To: <1344945535-2774-1-git-send-email-armbru@redhat.com> References: <1344945535-2774-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] vl: Round argument of -m up to multiple of 8KiB List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, anthony@codemonkey.ws, avi@redhat.com, gleb@redhat.com Partial pages make little sense and don't work. Ensure the RAM size is a multiple of any possible target's page size. Fixes $ qemu-system-x86_64 -nodefaults -S -vnc :0 -monitor stdio -m 0.8 QEMU 1.1.50 monitor - type 'help' for more information (qemu) qemu-system-x86_64: /work/armbru/qemu/exec.c:2255: register_subpage: Assertion `existing->mr->subpage || existing->mr == &io_mem_unassigned' failed Signed-off-by: Markus Armbruster --- See also http://lists.nongnu.org/archive/html/qemu-devel/2012-06/msg02813.html vl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index d01256a..b411d45 100644 --- a/vl.c +++ b/vl.c @@ -2708,11 +2708,13 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); exit(1); } - if (value != (uint64_t)(ram_addr_t)value) { fprintf(stderr, "qemu: ram size too large\n"); exit(1); } + if (value & 0x1fff) { + value = (value + 0x1fff) & ~0x1fff; + } ram_size = value; break; } -- 1.7.11.2