diff options
| author | Glauber Costa <glommer@redhat.com> | 2009-05-18 16:35:58 -0400 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-05-20 09:12:58 -0500 |
| commit | e6ade764ebbbac9a0ce2f710ef0d97272eb1657f (patch) | |
| tree | e30a270b3aada57f751d3ab642e430bae4beea99 | |
| parent | 95b134ea02a3e2c2508f907db4ab1379ffdb0bef (diff) | |
| download | focaccia-qemu-e6ade764ebbbac9a0ce2f710ef0d97272eb1657f.tar.gz focaccia-qemu-e6ade764ebbbac9a0ce2f710ef0d97272eb1657f.zip | |
keep initrd in below 4g area.
initrd must be kept on the memory area below 4g. By not doing this, we're seeing guests break while using -initrd and values of -mem superior to 4096. Signed-off-by: Glauber Costa <glommer@redhat.com>
| -rw-r--r-- | hw/pc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/pc.c b/hw/pc.c index 5c049bfc8c..fda05eeb61 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -596,7 +596,8 @@ static long get_file_size(FILE *f) static void load_linux(target_phys_addr_t option_rom, const char *kernel_filename, const char *initrd_filename, - const char *kernel_cmdline) + const char *kernel_cmdline, + target_phys_addr_t max_ram_size) { uint16_t protocol; uint32_t gpr[8]; @@ -662,8 +663,8 @@ static void load_linux(target_phys_addr_t option_rom, else initrd_max = 0x37ffffff; - if (initrd_max >= ram_size-ACPI_DATA_SIZE) - initrd_max = ram_size-ACPI_DATA_SIZE-1; + if (initrd_max >= max_ram_size-ACPI_DATA_SIZE) + initrd_max = max_ram_size-ACPI_DATA_SIZE-1; /* kernel command line */ pstrcpy_targphys(cmdline_addr, 4096, kernel_cmdline); @@ -960,7 +961,7 @@ static void pc_init1(ram_addr_t ram_size, if (linux_boot) { load_linux(0xc0000 + oprom_area_size, - kernel_filename, initrd_filename, kernel_cmdline); + kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); oprom_area_size += 2048; } |