# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID f89906acd9f6f58b28d673403d4a592e18cacb09
# Parent b4925703b56c0944e304f073c3117da4f3d71ccd
Plumb through nr_pages -- needed for correct balloon driver function
diff -r b4925703b56c -r f89906acd9f6
linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c Fri Dec 30
18:55:19 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c Fri Dec 30
22:11:08 2005
@@ -25,8 +25,9 @@
xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
xen_start_info->flags = s->arch.flags;
- printk("Running on Xen! start_info_pfn=0x%lx lags=0x%x\n",
- s->arch.start_info_pfn, xen_start_info->flags);
+ printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%d flags=0x%x\n",
+ s->arch.start_info_pfn, xen_start_info->nr_pages,
+ xen_start_info->flags);
evtchn_init();
initialized = 1;
diff -r b4925703b56c -r f89906acd9f6 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Fri Dec 30 18:55:19 2005
+++ b/tools/libxc/xc_linux_build.c Fri Dec 30 22:11:08 2005
@@ -393,6 +393,7 @@
start_info->store_evtchn = store_evtchn;
start_info->console_mfn = nr_pages - 1;
start_info->console_evtchn = console_evtchn;
+ start_info->nr_pages = nr_pages; // FIXME?: nr_pages - 2 ????
if ( initrd_len != 0 )
{
ctxt->initrd.start = vinitrd_start;
diff -r b4925703b56c -r f89906acd9f6 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Fri Dec 30 18:55:19 2005
+++ b/xen/arch/ia64/xen/domain.c Fri Dec 30 22:11:08 2005
@@ -903,9 +903,9 @@
memset(si, 0, PAGE_SIZE);
d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT;
sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
+ si->nr_pages = d->tot_pages;
#if 0
- si->nr_pages = d->tot_pages;
si->shared_info = virt_to_phys(d->shared_info);
si->flags = SIF_PRIVILEGED | SIF_INITDOMAIN;
//si->pt_base = vpt_start;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home