[Xen-changelog] Support domU initrd and cmdline (previous cset also)

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 724f412d81abef213d67814100901a187710efa9
# Parent  85261a82e02c61829e953c99795a3a5999d4608c
Support domU initrd and cmdline (previous cset also)
Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>

diff -r 85261a82e02c -r 724f412d81ab xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Wed Dec 21 15:07:09 2005
+++ b/xen/arch/ia64/xen/domain.c        Wed Dec 21 15:31:05 2005
@@ -367,10 +367,13 @@
                    regs->r28 = dom_fw_setup(d,saved_command_line,256L);
                else {
                    regs->ar_rsc |= (2 << 2); /* force PL2/3 */
-                   //regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L);
-printf("construct domU: d->arch.cmdline=%p, firstchar=%d\n",
-d->arch.cmdline,*(d->arch.cmdline));
-                   regs->r28 = dom_fw_setup(d,"nomca nosmp xencons=tty0 
console=tty0 root=/dev/hda1",256L);  //FIXME
+                   if (*d->arch.cmdline == '\0') {
+#define DEFAULT_CMDLINE "nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1"
+                       regs->r28 = dom_fw_setup(d,DEFAULT_CMDLINE,256L);
+                       printf("domU command line defaulted to"
+                               DEFAULT_CMDLINE "\n");
+                   }
+                   else regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L);
                }
                VCPU(v, banknum) = 1;
                VCPU(v, metaphysical_mode) = 1;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog