Patchwork [v3,1/2] vl: Round argument of -m up to multiple of 8KiB

login
register
mail settings
Submitter Markus Armbruster
Date Aug. 15, 2012, 11:12 a.m.
Message ID <1345029140-12338-2-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/177628/
State New
Headers show

Comments

Markus Armbruster - Aug. 15, 2012, 11:12 a.m.
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 <armbru@redhat.com>
---
 vl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

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: