From fd21cc14f57247339be0ebf3e0845e431aa5aedc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 15 Aug 2012 13:12:19 +0200 Subject: vl: Round argument of -m up to multiple of 8KiB 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 Signed-off-by: Blue Swirl (cherry picked from commit ff961015529437f4b83fca0a92069aebcf533c9c) Signed-off-by: Michael Roth --- vl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 23ab3a34d..1dd4c6b31 100644 --- a/vl.c +++ b/vl.c @@ -2659,6 +2659,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); @@ -2666,12 +2667,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: -- cgit v1.2.3