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>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 47924a54e03f2e02eb48cae63b2a23273b85892c..1fcaeedfe9ba1a16c669d4b0546d1d0238a08d28 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -2137,8 +2137,7 @@ int __init construct_dom0(struct domain *d,
                panic("can't allocate start info page");
        si = page_to_virt(start_info_page);
        clear_page(si);
-       snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-ia64",
-               xen_major_version(), xen_minor_version());
+       snprintf(si->magic, sizeof(si->magic), "xen-3.0-ia64");
        si->nr_pages     = max_pages;
        si->flags = SIF_INITDOMAIN|SIF_PRIVILEGED;
 

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 637a29f3c3284427ce0a09e22242809636eaa583..f530e27f5720f89c35c412923332f2fcb0193814 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -832,10 +832,8 @@ int __init construct_dom0(
     si->pt_base      = vpt_start + 2 * PAGE_SIZE * !!is_pv_32on64_domain(d);
     si->nr_pt_frames = nr_pt_pages;
     si->mfn_list     = vphysmap_start;
-    snprintf(si->magic, sizeof(si->magic), "xen-%i.%i-x86_%d%s",
-            xen_major_version(), xen_minor_version(),
-            elf_64bit(&elf) ? 64 : 32,
-            parms.pae ? "p" : "");
+    snprintf(si->magic, sizeof(si->magic), "xen-3.0-x86_%d%s",
+             elf_64bit(&elf) ? 64 : 32, parms.pae ? "p" : "");
 
     /* Write the phys->machine and machine->phys table entries. */
     for ( pfn = 0; pfn < d->tot_pages; pfn++ )