[OpenBIOS] [PATCH v2] use the kernel arguments when using -kernel -append

[Aurelien Jarno]

Please find a new version of the patch below, that verifies that a
command line has been given by qemu before defining the bootargs
property. 

Index: arch/ppc/qemu/main.c
===================================================================
--- arch/ppc/qemu/main.c	(révision 398)
+++ arch/ppc/qemu/main.c	(copie de travail)
@@ -364,18 +368,24 @@
 
 static void check_preloaded_kernel(void)
 {
-    unsigned long kernel_image, kernel_size, cmdline;
+    unsigned long kernel_image, kernel_size;
     unsigned long initrd_image, initrd_size;
+    unsigned long cmdline, cmdline_len;
 
     kernel_size = nvram_read_be32(0x3c);
     if (kernel_size) {
         kernel_image = nvram_read_be32(0x38);
         cmdline = nvram_read_be32(0x40);
+        cmdline_len = nvram_read_be32(0x44);
         initrd_image = nvram_read_be32(0x48);
         initrd_size = nvram_read_be32(0x4c);
         printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) "
                "(initrd 0x%8.8lx + 0x%8.8lx)\n",
                kernel_image, kernel_size, initrd_image, initrd_size);
+        if (cmdline_len > 0) {
+               phandle_t ph = find_dev("/chosen");
+               set_property(ph, "bootargs", cmdline, cmdline_len + 1);
+        }
         call_elf(initrd_image, initrd_size, kernel_image);
     }
 }

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32 at debian.org         | aurelien at aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net