From f5b4a6be712e2a3a0bdb444e5e87de3d17019965 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 4 Sep 2009 16:13:52 +0100 Subject: [PATCH] remove check on ram_size the initial check on the ram_size in qemu is completely unnecessary and it is even broken on systems where dom0 is 32 bits while xen is 64 bits. This patch solves the problem removing the check. Signed-off-by: Stefano Stabellini --- vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 62bed05a..06d96626 100644 --- a/vl.c +++ b/vl.c @@ -5104,7 +5104,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); exit(1); } - +#ifndef CONFIG_DM /* On 32-bit hosts, QEMU is limited by virtual address space */ if (value > (2047 << 20) #ifndef USE_KQEMU @@ -5118,6 +5118,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: ram size too large\n"); exit(1); } +#endif ram_size = value; break; } @@ -5682,6 +5683,7 @@ int main(int argc, char **argv, char **envp) ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */ #endif +#ifndef CONFIG_DM if (machine->ram_require & RAMSIZE_FIXED) { if (ram_size > 0) { if (ram_size < phys_ram_size) { @@ -5700,7 +5702,6 @@ int main(int argc, char **argv, char **envp) phys_ram_size += ram_size; } -#ifndef CONFIG_DM phys_ram_base = qemu_vmalloc(phys_ram_size); if (!phys_ram_base) { fprintf(stderr, "Could not allocate physical memory\n"); -- 2.39.5