Mailing List Archive

# HG changeset patch
# User djm@kirby.fc.hp.com
# Node ID f218e6ba2653d3f2d50e11ea4b18c743d6c9127f
# Parent 934470721c46e85651a364ab5d8369e8fde8798d
Missed portion of domU initrd patch
Signed-off-by: <takebe_akio@jp.fujitsu.com>

diff -r 934470721c46 -r f218e6ba2653 xen/arch/ia64/xen/dom_fw.c
--- a/xen/arch/ia64/xen/dom_fw.c Wed Dec 21 19:18:19 2005
+++ b/xen/arch/ia64/xen/dom_fw.c Fri Dec 23 21:14:21 2005
@@ -861,12 +861,16 @@
bp->console_info.orig_x = 0;
bp->console_info.orig_y = 24;
bp->fpswa = 0;
- bp->initrd_start = (dom0_start+dom0_size) -
- (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
- bp->initrd_size = ia64_boot_param->initrd_size;
- printf(" initrd start %0xlx", bp->initrd_start);
- printf(" initrd size %0xlx", bp->initrd_size);
-
-
+ if (d == dom0) {
+ bp->initrd_start = (dom0_start+dom0_size) -
+ (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
+ bp->initrd_size = ia64_boot_param->initrd_size;
+ }
+ else {
+ bp->initrd_start = d->arch.initrd_start;
+ bp->initrd_size = d->arch.initrd_len;
+ }
+ printf(" initrd start %0xlx", bp->initrd_start);
+ printf(" initrd size %0xlx", bp->initrd_size);
return bp;
}

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