diff options
| author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-12-30 16:11:08 -0600 |
|---|---|---|
| committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-12-30 16:11:08 -0600 |
| commit | 53879eb47b31895e9665b255d30f3568b4002df1 (patch) | |
| tree | b9716090c27ca3bfbeaf72fe9a428c4e88352d10 | |
| parent | bc1bd4b0d8537d0484b51ac92b410fc5a9439277 (diff) | |
| download | xen-53879eb47b31895e9665b255d30f3568b4002df1.tar.gz xen-53879eb47b31895e9665b255d30f3568b4002df1.tar.bz2 xen-53879eb47b31895e9665b255d30f3568b4002df1.zip | |
Plumb through nr_pages -- needed for correct balloon driver function
| -rw-r--r-- | linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c | 5 | ||||
| -rw-r--r-- | tools/libxc/xc_linux_build.c | 1 | ||||
| -rw-r--r-- | xen/arch/ia64/xen/domain.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c index d04328e557..8d441df8ac 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c @@ -25,8 +25,9 @@ int xen_init(void) 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 --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index bab6e8d1a8..f684b7185f 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -393,6 +393,7 @@ static int setup_guest(int xc_handle, 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 --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 5f4827ec2d..eafd6dda5a 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -903,9 +903,9 @@ int construct_dom0(struct domain *d, 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; |