motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'agraf/xen-next' into staging

Browse source
This commit is contained in:
Anthony Liguori 2011-07-29 09:42:12 -05:00
commit 3046c98404
10 changed files with 162 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
vl.c
View file

@ -2454,11 +2454,6 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
/* On 32-bit hosts, QEMU is limited by virtual address space */
if (value > (2047 << 20) && HOST_LONG_BITS == 32) {
fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
exit(1);
}
if (value != (uint64_t)(ram_addr_t)value) {
fprintf(stderr, "qemu: ram size too large\n");
exit(1);
@ -3116,8 +3111,17 @@ int main(int argc, char **argv, char **envp)
exit(1);
/* init the memory */
if (ram_size == 0)
if (ram_size == 0) {
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
}
if (!xen_enabled()) {
/* On 32-bit hosts, QEMU is limited by virtual address space */
if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) {
fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
exit(1);
}
}
/* init the dynamic translator */
cpu_exec_init_all(tb_size * 1024 * 1024);