From: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Date: Fri, 15 May 2009 14:53:53 +0000 (+0200)
Subject: ETRAX: Correct passing of kernel command line.
X-Git-Tag: v0.11.0-rc0~592
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d33fd9d14b97731721e70bbb500ebc33c9e3a6ef;p=qemu-xen-4.6-testing.git

ETRAX: Correct passing of kernel command line.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 098c275af..8df536d6b 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -350,10 +350,10 @@ void axisdev88_init (ram_addr_t ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 56cb24977..ad82132c3 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -141,10 +141,10 @@ void bareetraxfs_init (ram_addr_t ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;