ia64/xen-unstable

changeset 16402:64fbef22f86a

xen: Domain0 builder should set start_info magic string to
'xen-3.0-...' just like user-space builder for domUs.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Nov 20 14:35:36 2007 +0000 (2007-11-20)
parents d2935f9c217f
children bc6aaa44e296
files xen/arch/ia64/xen/domain.c xen/arch/x86/domain_build.c
line diff
     1.1 --- a/xen/arch/ia64/xen/domain.c	Sat Nov 17 13:11:25 2007 +0000
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Tue Nov 20 14:35:36 2007 +0000
     1.3 @@ -2137,8 +2137,7 @@ int __init construct_dom0(struct domain 
     1.4  		panic("can't allocate start info page");
     1.5  	si = page_to_virt(start_info_page);
     1.6  	clear_page(si);
     1.7 -	snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-ia64",
     1.8 -		xen_major_version(), xen_minor_version());
     1.9 +	snprintf(si->magic, sizeof(si->magic), "xen-3.0-ia64");
    1.10  	si->nr_pages     = max_pages;
    1.11  	si->flags = SIF_INITDOMAIN|SIF_PRIVILEGED;
    1.12  
     2.1 --- a/xen/arch/x86/domain_build.c	Sat Nov 17 13:11:25 2007 +0000
     2.2 +++ b/xen/arch/x86/domain_build.c	Tue Nov 20 14:35:36 2007 +0000
     2.3 @@ -832,10 +832,8 @@ int __init construct_dom0(
     2.4      si->pt_base      = vpt_start + 2 * PAGE_SIZE * !!is_pv_32on64_domain(d);
     2.5      si->nr_pt_frames = nr_pt_pages;
     2.6      si->mfn_list     = vphysmap_start;
     2.7 -    snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-x86_%d%s",
     2.8 -            xen_major_version(), xen_minor_version(),
     2.9 -            elf_64bit(&elf) ? 64 : 32,
    2.10 -            parms.pae ? "p" : "");
    2.11 +    snprintf(si->magic, sizeof(si->magic), "xen-3.0-x86_%d%s",
    2.12 +             elf_64bit(&elf) ? 64 : 32, parms.pae ? "p" : "");
    2.13  
    2.14      /* Write the phys->machine and machine->phys table entries. */
    2.15      for ( pfn = 0; pfn < d->tot_pages; pfn++ )