# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID c5a49efa11d6e135437b9f7bc6b34f2c29153eb6
# Parent fe3a892b33b4ccd3593bde788ceafa0668227450
Trivial fixes for 64bit and xend.
Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>
diff -r fe3a892b33b4 -r c5a49efa11d6
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c Wed Nov 16
16:45:03 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c Wed Nov 16
17:03:48 2005
@@ -770,9 +770,9 @@
pfn_to_mfn_frame_list_list = alloc_bootmem(PAGE_SIZE);
HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
virt_to_mfn(pfn_to_mfn_frame_list_list);
-
+
fpp = PAGE_SIZE/sizeof(unsigned long);
- for ( i=0, j=0, k=-1; i< max_pfn; i+=fpp, j++ )
+ for ( i=0, j=0, k=-1; i< end_pfn; i+=fpp, j++ )
{
if ( (j % fpp) == 0 )
{
@@ -786,8 +786,11 @@
pfn_to_mfn_frame_list[k][j] =
virt_to_mfn(&phys_to_machine_mapping[i]);
}
- HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
- }
+ HYPERVISOR_shared_info->arch.max_pfn = end_pfn;
+
+ }
+
+
if ( ! (xen_start_info->flags & SIF_INITDOMAIN))
{
diff -r fe3a892b33b4 -r c5a49efa11d6 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Wed Nov 16 16:45:03 2005
+++ b/tools/libxc/xc_linux_build.c Wed Nov 16 17:03:48 2005
@@ -629,7 +629,7 @@
memset(start_info, 0, sizeof(*start_info));
rc = xc_version(xc_handle, XENVER_version, NULL);
sprintf(start_info->magic, "xen-%i.%i-x86_%d%s",
- rc >> 16, rc & (0xFFFF), sizeof(long)*8,
+ rc >> 16, rc & (0xFFFF), (unsigned int)sizeof(long)*8,
dsi.pae_kernel ? "p" : "");
start_info->nr_pages = nr_pages;
start_info->shared_info = shared_info_frame << PAGE_SHIFT;
diff -r fe3a892b33b4 -r c5a49efa11d6 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Wed Nov 16 16:45:03 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py Wed Nov 16 17:03:48 2005
@@ -597,7 +597,8 @@
if self.infoIsSet('image'):
to_store['image'] = sxp.to_string(self.info['image'])
- to_store['start_time'] = str(self.info['start_time'])
+ if self.infoIsSet('start_time'):
+ to_store['start_time'] = str(self.info['start_time'])
log.debug("Storing VM details: %s", to_store)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home