[XenPPC] [xenppc-unstable] merge

[Xen patchbot-xenppc-unstable]

# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 014c4ef0e124a81a072a92bd4cff17e6214d8897
# Parent  4b07d05c1b4e3492199e118d03f89209caffcad2
# Parent  9a758f814f60166dcf4a386bb9835f58c8f68502
merge
---
 xen/arch/powerpc/boot_of.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff -r 4b07d05c1b4e -r 014c4ef0e124 xen/arch/powerpc/boot_of.c
--- a/xen/arch/powerpc/boot_of.c        Sun Dec 17 12:53:12 2006 -0500
+++ b/xen/arch/powerpc/boot_of.c        Sun Dec 17 12:54:30 2006 -0500
@@ -1070,10 +1070,11 @@ static void * __init boot_of_module(ulon
     static module_t mods[4];
     ulong mod0_start;
     ulong mod0_size;
-    static const char sepr[] = " -- ";
+    static const char * sepr[] = {" -- ", " || "};
+    int sepr_index;
     extern char dom0_start[] __attribute__ ((weak));
     extern char dom0_size[] __attribute__ ((weak));
-    const char *p;
+    const char *p = NULL;
     int mod;
     void *oft;
 
@@ -1124,11 +1125,18 @@ static void * __init boot_of_module(ulon
 
     of_printf("%s: dom0 mod @ 0x%016x[0x%x]\n", __func__,
               mods[mod].mod_start, mods[mod].mod_end);
-    p = strstr((char *)(ulong)mbi->cmdline, sepr);
+
+    /* look for delimiter: "--" or "||" */
+    for (sepr_index = 0; sepr_index < ARRAY_SIZE(sepr); sepr_index++){
+        p = strstr((char *)(ulong)mbi->cmdline, sepr[sepr_index]);
+        if (p != NULL)
+            break;
+    }
+
     if (p != NULL) {
         /* Xen proper should never know about the dom0 args.  */
         *(char *)p = '\0';
-        p += sizeof (sepr) - 1;
+        p += strlen(sepr[sepr_index]);
         mods[mod].string = (u32)(ulong)p;
         of_printf("%s: dom0 mod string: %s\n", __func__, p);
     }

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel