From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bWT-0006IX-Bc for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1bWQ-0002GW-Q5 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:25 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:34622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bWQ-0002G7-Iy for qemu-devel@nongnu.org; Wed, 15 Aug 2012 07:12:22 -0400 From: Markus Armbruster Date: Wed, 15 Aug 2012 13:12:19 +0200 Message-Id: <1345029140-12338-2-git-send-email-armbru@redhat.com> In-Reply-To: <1345029140-12338-1-git-send-email-armbru@redhat.com> References: <1345029140-12338-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 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 -m 0.8 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 --- vl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index d01256a..a63e16b 100644 --- a/vl.c +++ b/vl.c @@ -2701,6 +2701,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_m: { int64_t value; + uint64_t sz; char *end; value = strtosz(optarg, &end); @@ -2708,12 +2709,12 @@ 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) { + sz = QEMU_ALIGN_UP((uint64_t)value, 8192); + ram_size = sz; + if (ram_size != sz) { fprintf(stderr, "qemu: ram size too large\n"); exit(1); } - ram_size = value; break; } case QEMU_OPTION_mempath: -- 1.7.11.2