ia64/xen-unstable

changeset 8381:724f412d81ab

Support domU initrd and cmdline (previous cset also)
Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
author djm@kirby.fc.hp.com
date Wed Dec 21 09:31:05 2005 -0600 (2005-12-21)
parents 85261a82e02c
children 3d379e5f3d7f
files xen/arch/ia64/xen/domain.c
line diff
     1.1 --- a/xen/arch/ia64/xen/domain.c	Wed Dec 21 09:07:09 2005 -0600
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Wed Dec 21 09:31:05 2005 -0600
     1.3 @@ -367,10 +367,13 @@ void new_thread(struct vcpu *v,
     1.4  		    regs->r28 = dom_fw_setup(d,saved_command_line,256L);
     1.5  		else {
     1.6  		    regs->ar_rsc |= (2 << 2); /* force PL2/3 */
     1.7 -		    //regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L);
     1.8 -printf("construct domU: d->arch.cmdline=%p, firstchar=%d\n",
     1.9 -d->arch.cmdline,*(d->arch.cmdline));
    1.10 -		    regs->r28 = dom_fw_setup(d,"nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1",256L);  //FIXME
    1.11 +		    if (*d->arch.cmdline == '\0') {
    1.12 +#define DEFAULT_CMDLINE "nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1"
    1.13 +			regs->r28 = dom_fw_setup(d,DEFAULT_CMDLINE,256L);
    1.14 +			printf("domU command line defaulted to"
    1.15 +				DEFAULT_CMDLINE "\n");
    1.16 +		    }
    1.17 +		    else regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L);
    1.18  		}
    1.19  		VCPU(v, banknum) = 1;
    1.20  		VCPU(v, metaphysical_mode) = 1;