mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-27 21:40:49 +00:00
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>
This commit is contained in:
parent
d83c951cce
commit
ff96101552
7
vl.c
7
vl.c
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user