diff options
author | Markus Armbruster <armbru@redhat.com> | 2012-08-15 13:12:19 +0200 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-08-18 16:53:21 +0000 |
commit | ff961015529437f4b83fca0a92069aebcf533c9c (patch) | |
tree | 58aeed0b2560f36269e775ce9c7807322635da59 /vl.c | |
parent | d83c951cce14dd3c7600c386d3791c4993744622 (diff) | |
download | qemu-ff961015529437f4b83fca0a92069aebcf533c9c.zip qemu-ff961015529437f4b83fca0a92069aebcf533c9c.tar.gz qemu-ff961015529437f4b83fca0a92069aebcf533c9c.tar.bz2 |
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 <armbru@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -2735,6 +2735,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); @@ -2742,12 +2743,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: |