|
 |
76b47ee |
--- hw/pc.c.orig 2007-02-06 07:01:54.000000000 +0800
|
|
|
76b47ee |
+++ hw/pc.c 2007-04-01 22:19:50.000000000 +0800
|
|
|
76b47ee |
@@ -32,9 +32,11 @@
|
|
|
76b47ee |
#define LINUX_BOOT_FILENAME "linux_boot.bin"
|
|
|
76b47ee |
|
|
|
76b47ee |
#define KERNEL_LOAD_ADDR 0x00100000
|
|
|
76b47ee |
-#define INITRD_LOAD_ADDR 0x00600000
|
|
|
76b47ee |
+#define MAX_INITRD_LOAD_ADDR 0x38000000
|
|
|
76b47ee |
#define KERNEL_PARAMS_ADDR 0x00090000
|
|
|
76b47ee |
#define KERNEL_CMDLINE_ADDR 0x00099000
|
|
|
76b47ee |
+/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
|
|
|
76b47ee |
+#define ACPI_DATA_SIZE 0x10000
|
|
|
76b47ee |
|
|
|
76b47ee |
static fdctrl_t *floppy_controller;
|
|
|
76b47ee |
static RTCState *rtc_state;
|
|
|
76b47ee |
@@ -451,7 +453,7 @@
|
|
|
76b47ee |
{
|
|
|
76b47ee |
char buf[1024];
|
|
|
76b47ee |
int ret, linux_boot, initrd_size, i;
|
|
|
76b47ee |
- unsigned long bios_offset, vga_bios_offset, option_rom_offset;
|
|
|
76b47ee |
+ unsigned long bios_offset, vga_bios_offset, option_rom_offset, initrd_offset;
|
|
|
76b47ee |
int bios_size, isa_bios_size;
|
|
|
76b47ee |
PCIBus *pci_bus;
|
|
|
76b47ee |
int piix3_devfn = -1;
|
|
|
76b47ee |
@@ -576,8 +578,28 @@
|
|
|
76b47ee |
|
|
|
76b47ee |
/* load initrd */
|
|
|
76b47ee |
initrd_size = 0;
|
|
|
76b47ee |
+ initrd_offset = 0;
|
|
|
76b47ee |
if (initrd_filename) {
|
|
|
76b47ee |
- initrd_size = load_image(initrd_filename, phys_ram_base + INITRD_LOAD_ADDR);
|
|
|
76b47ee |
+ initrd_size = get_image_size (initrd_filename);
|
|
|
76b47ee |
+ if (initrd_size > 0) {
|
|
|
76b47ee |
+ initrd_offset = (ram_size - initrd_size) & TARGET_PAGE_MASK;
|
|
|
76b47ee |
+ /* Leave space for BIOS ACPI tables. */
|
|
|
76b47ee |
+ initrd_offset -= ACPI_DATA_SIZE;
|
|
|
76b47ee |
+ /* Avoid the last 64k to avoid 2.2.x kernel bugs. */
|
|
|
76b47ee |
+ initrd_offset -= 0x10000;
|
|
|
76b47ee |
+ if (initrd_offset > MAX_INITRD_LOAD_ADDR)
|
|
|
76b47ee |
+ initrd_offset = MAX_INITRD_LOAD_ADDR;
|
|
|
76b47ee |
+
|
|
|
76b47ee |
+ if (initrd_size > ram_size
|
|
|
76b47ee |
+ || initrd_offset < KERNEL_LOAD_ADDR + ret) {
|
|
|
76b47ee |
+ fprintf(stderr,
|
|
|
76b47ee |
+ "qemu: memory too small for initial ram disk '%s'\n",
|
|
|
76b47ee |
+ initrd_filename);
|
|
|
76b47ee |
+ exit(1);
|
|
|
76b47ee |
+ }
|
|
|
76b47ee |
+ initrd_size = load_image(initrd_filename,
|
|
|
76b47ee |
+ phys_ram_base + initrd_offset);
|
|
|
76b47ee |
+ }
|
|
|
76b47ee |
if (initrd_size < 0) {
|
|
|
76b47ee |
fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
|
|
|
76b47ee |
initrd_filename);
|
|
|
76b47ee |
@@ -585,7 +607,7 @@
|
|
|
76b47ee |
}
|
|
|
76b47ee |
}
|
|
|
76b47ee |
if (initrd_size > 0) {
|
|
|
76b47ee |
- stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x218, INITRD_LOAD_ADDR);
|
|
|
76b47ee |
+ stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x218, initrd_offset);
|
|
|
76b47ee |
stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x21c, initrd_size);
|
|
|
76b47ee |
}
|
|
|
76b47ee |
pstrcpy(phys_ram_base + KERNEL_CMDLINE_ADDR, 4096,
|