rpms/kvm/devel qemu-0.9.0-load-initrd.patch, NONE, 1.1 kvm.spec, 1.11, 1.12

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14837

Modified Files:
	kvm.spec 
Added Files:
	qemu-0.9.0-load-initrd.patch 
Log Message:
* Wed Apr 25 2007 Jeremy Katz <katzj at redhat.com> - 19-2
- fix kernel and ramdisk being specified on the command line (#237879)


qemu-0.9.0-load-initrd.patch:

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


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kvm.spec	17 Apr 2007 22:35:40 -0000	1.11
+++ kvm.spec	25 Apr 2007 20:42:29 -0000	1.12
@@ -1,13 +1,15 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 19
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
 Source1: kvm.modules
 Patch0: kvm-19-defaults.patch
+# patches from upstream qemu
+Patch100: qemu-0.9.0-load-initrd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -32,6 +34,8 @@
 %setup -q
 %patch0 -p1 -b .defaults
 
+%patch100 -p0
+
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
 # we need to install the data bits in a different path
@@ -75,6 +79,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Wed Apr 25 2007 Jeremy Katz <katzj at redhat.com> - 19-2
+- fix kernel and ramdisk being specified on the command line (#237879)
+
 * Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 19-1
 - update to kvm-19
 - use rtl8139 as the default nic emulation instead of ne2k_pci (#236790)