Skip to content

Commit

Permalink
vl: Round argument of -m up to multiple of 8KiB
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Markus Armbruster authored and blueswirl committed Aug 18, 2012
1 parent d83c951 commit ff96101
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2735,19 +2735,20 @@ 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);
if (value < 0 || *end) {
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:
Expand Down

0 comments on commit ff96101

Please sign in to comment.