[Xen-changelog] [xen-unstable] xen: Domain0 builder should set start_info magic string to

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1195569336 0
# Node ID 64fbef22f86a0fa74a31bf865ebed95aa5179fa6
# Parent  d2935f9c217f4fcb6614943e4aca4422a4009a21
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@xxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/domain.c  |    3 +--
 xen/arch/x86/domain_build.c |    6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff -r d2935f9c217f -r 64fbef22f86a xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Sat Nov 17 13:11:25 2007 +0000
+++ b/xen/arch/ia64/xen/domain.c        Tue Nov 20 14:35:36 2007 +0000
@@ -2137,8 +2137,7 @@ int __init construct_dom0(struct domain 
                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 -r d2935f9c217f -r 64fbef22f86a xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Sat Nov 17 13:11:25 2007 +0000
+++ b/xen/arch/x86/domain_build.c       Tue Nov 20 14:35:36 2007 +0000
@@ -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++ )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog