direct-io.hg

changeset 8484:f89906acd9f6

Plumb through nr_pages -- needed for correct balloon driver function
author djm@kirby.fc.hp.com
date Fri Dec 30 16:11:08 2005 -0600 (2005-12-30)
parents b4925703b56c
children 45c4e735fc8c
files linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c tools/libxc/xc_linux_build.c xen/arch/ia64/xen/domain.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c	Fri Dec 30 12:55:19 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c	Fri Dec 30 16:11:08 2005 -0600
     1.3 @@ -25,8 +25,9 @@ int xen_init(void)
     1.4  
     1.5  	xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
     1.6  	xen_start_info->flags = s->arch.flags;
     1.7 -	printk("Running on Xen! start_info_pfn=0x%lx lags=0x%x\n",
     1.8 -		s->arch.start_info_pfn, xen_start_info->flags);
     1.9 +	printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%d flags=0x%x\n",
    1.10 +		s->arch.start_info_pfn, xen_start_info->nr_pages,
    1.11 +		xen_start_info->flags);
    1.12  
    1.13  	evtchn_init();
    1.14  	initialized = 1;
     2.1 --- a/tools/libxc/xc_linux_build.c	Fri Dec 30 12:55:19 2005 -0600
     2.2 +++ b/tools/libxc/xc_linux_build.c	Fri Dec 30 16:11:08 2005 -0600
     2.3 @@ -393,6 +393,7 @@ static int setup_guest(int xc_handle,
     2.4      start_info->store_evtchn = store_evtchn;
     2.5      start_info->console_mfn   = nr_pages - 1;
     2.6      start_info->console_evtchn = console_evtchn;
     2.7 +    start_info->nr_pages       = nr_pages;	// FIXME?: nr_pages - 2 ????
     2.8      if ( initrd_len != 0 )
     2.9      {
    2.10          ctxt->initrd.start    = vinitrd_start;
     3.1 --- a/xen/arch/ia64/xen/domain.c	Fri Dec 30 12:55:19 2005 -0600
     3.2 +++ b/xen/arch/ia64/xen/domain.c	Fri Dec 30 16:11:08 2005 -0600
     3.3 @@ -903,9 +903,9 @@ int construct_dom0(struct domain *d,
     3.4  	memset(si, 0, PAGE_SIZE);
     3.5  	d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT;
     3.6  	sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
     3.7 +	si->nr_pages     = d->tot_pages;
     3.8  
     3.9  #if 0
    3.10 -	si->nr_pages     = d->tot_pages;
    3.11  	si->shared_info  = virt_to_phys(d->shared_info);
    3.12  	si->flags        = SIF_PRIVILEGED | SIF_INITDOMAIN;
    3.13  	//si->pt_base      = vpt_start;