falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit ff96101552)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Markus Armbruster 2012-08-15 13:12:19 +02:00 committed by Michael Roth
parent cfeb9958c8
commit fd21cc14f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vl.c
View File

@ -2659,6 +2659,7 @@ int main(int argc, char **argv, char **envp)
break; break;
case QEMU_OPTION_m: { case QEMU_OPTION_m: {
int64_t value; int64_t value;
uint64_t sz;
char *end; char *end;
value = strtosz(optarg, &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); fprintf(stderr, "qemu: invalid ram size: %s\n", optarg);
exit(1); exit(1);
} }
sz = QEMU_ALIGN_UP((uint64_t)value, 8192);
if (value != (uint64_t)(ram_addr_t)value) { ram_size = sz;
if (ram_size != sz) {
fprintf(stderr, "qemu: ram size too large\n"); fprintf(stderr, "qemu: ram size too large\n");
exit(1); exit(1);
} }
ram_size = value;
break; break;
} }
case QEMU_OPTION_mempath: case QEMU_OPTION_mempath: