ia64/xen-unstable

changeset 7866:c5a49efa11d6

Trivial fixes for 64bit and xend.

Signed-off-by: Steven Hand <steven@xensource.com>
author smh22@tempest.cl.cam.ac.uk
date Wed Nov 16 18:03:48 2005 +0100 (2005-11-16)
parents fe3a892b33b4
children 9c68f4a58aa9
files linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c tools/libxc/xc_linux_build.c tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Wed Nov 16 17:45:03 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Wed Nov 16 18:03:48 2005 +0100
     1.3 @@ -770,9 +770,9 @@ void __init setup_arch(char **cmdline_p)
     1.4  		pfn_to_mfn_frame_list_list = alloc_bootmem(PAGE_SIZE);
     1.5  		HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
     1.6  		  virt_to_mfn(pfn_to_mfn_frame_list_list);
     1.7 -	       
     1.8 +
     1.9  		fpp = PAGE_SIZE/sizeof(unsigned long);
    1.10 -		for ( i=0, j=0, k=-1; i< max_pfn; i+=fpp, j++ )
    1.11 +		for ( i=0, j=0, k=-1; i< end_pfn; i+=fpp, j++ )
    1.12  		{
    1.13  			if ( (j % fpp) == 0 )
    1.14  			{
    1.15 @@ -786,9 +786,12 @@ void __init setup_arch(char **cmdline_p)
    1.16  			pfn_to_mfn_frame_list[k][j] = 
    1.17  				virt_to_mfn(&phys_to_machine_mapping[i]);
    1.18  		}
    1.19 -		HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
    1.20 +		HYPERVISOR_shared_info->arch.max_pfn = end_pfn;
    1.21 +
    1.22  	}
    1.23  
    1.24 +
    1.25 +
    1.26  	if ( ! (xen_start_info->flags & SIF_INITDOMAIN))
    1.27  	{
    1.28  		acpi_disabled = 1;
     2.1 --- a/tools/libxc/xc_linux_build.c	Wed Nov 16 17:45:03 2005 +0100
     2.2 +++ b/tools/libxc/xc_linux_build.c	Wed Nov 16 18:03:48 2005 +0100
     2.3 @@ -629,7 +629,7 @@ static int setup_guest(int xc_handle,
     2.4      memset(start_info, 0, sizeof(*start_info));
     2.5      rc = xc_version(xc_handle, XENVER_version, NULL);
     2.6      sprintf(start_info->magic, "xen-%i.%i-x86_%d%s",
     2.7 -            rc >> 16, rc & (0xFFFF), sizeof(long)*8,
     2.8 +            rc >> 16, rc & (0xFFFF), (unsigned int)sizeof(long)*8,
     2.9              dsi.pae_kernel ? "p" : "");
    2.10      start_info->nr_pages     = nr_pages;
    2.11      start_info->shared_info  = shared_info_frame << PAGE_SHIFT;
     3.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed Nov 16 17:45:03 2005 +0100
     3.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed Nov 16 18:03:48 2005 +0100
     3.3 @@ -597,7 +597,8 @@ class XendDomainInfo:
     3.4          if self.infoIsSet('image'):
     3.5              to_store['image'] = sxp.to_string(self.info['image'])
     3.6  
     3.7 -        to_store['start_time'] = str(self.info['start_time'])
     3.8 +        if self.infoIsSet('start_time'):
     3.9 +            to_store['start_time'] = str(self.info['start_time'])
    3.10  
    3.11          log.debug("Storing VM details: %s", to_store)
    3.12