ia64/xen-unstable

changeset 7854:fb50fba1895c

Fix up start_info_t magic string to match the format of
XENVER_capabilities strings.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Nov 16 12:23:17 2005 +0100 (2005-11-16)
parents fa99d895bb18
children 50dcb6266990
files tools/libxc/xc_linux_build.c xen/arch/ia64/xen/domain.c xen/arch/x86/domain_build.c xen/include/public/xen.h
line diff
     1.1 --- a/tools/libxc/xc_linux_build.c	Wed Nov 16 11:41:14 2005 +0100
     1.2 +++ b/tools/libxc/xc_linux_build.c	Wed Nov 16 12:23:17 2005 +0100
     1.3 @@ -351,7 +351,7 @@ static int setup_guest(int xc_handle,
     1.4          xc_handle, dom, PAGE_SIZE, PROT_READ|PROT_WRITE, page_array[0]);
     1.5      memset(start_info, 0, sizeof(*start_info));
     1.6      rc = xc_version(xc_handle, XENVER_version, NULL);
     1.7 -    sprintf(start_info->magic, "xen-%i.%i", rc >> 16, rc & (0xFFFF));
     1.8 +    sprintf(start_info->magic, "xen-%i.%i-ia64", rc >> 16, rc & (0xFFFF));
     1.9      start_info->flags        = flags;
    1.10      start_info->store_mfn    = nr_pages - 2;
    1.11      start_info->store_evtchn = store_evtchn;
    1.12 @@ -628,7 +628,9 @@ static int setup_guest(int xc_handle,
    1.13          page_array[(vstartinfo_start-dsi.v_start)>>PAGE_SHIFT]);
    1.14      memset(start_info, 0, sizeof(*start_info));
    1.15      rc = xc_version(xc_handle, XENVER_version, NULL);
    1.16 -    sprintf(start_info->magic, "xen-%i.%i", rc >> 16, rc & (0xFFFF));
    1.17 +    sprintf(start_info->magic, "xen-%i.%i-x86_%d%s",
    1.18 +            rc >> 16, rc & (0xFFFF), sizeof(long)*8,
    1.19 +            dsi.pae_kernel ? "p" : "");
    1.20      start_info->nr_pages     = nr_pages;
    1.21      start_info->shared_info  = shared_info_frame << PAGE_SHIFT;
    1.22      start_info->flags        = flags;
     2.1 --- a/xen/arch/ia64/xen/domain.c	Wed Nov 16 11:41:14 2005 +0100
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Wed Nov 16 12:23:17 2005 +0100
     2.3 @@ -952,7 +952,7 @@ int construct_dom0(struct domain *d,
     2.4  	si = (start_info_t *)alloc_xenheap_page();
     2.5  	memset(si, 0, PAGE_SIZE);
     2.6  	d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT;
     2.7 -	sprintf(si->magic, "Xen-%i.%i", XEN_VERSION, XEN_SUBVERSION);
     2.8 +	sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
     2.9  
    2.10  #if 0
    2.11  	si->nr_pages     = d->tot_pages;
     3.1 --- a/xen/arch/x86/domain_build.c	Wed Nov 16 11:41:14 2005 +0100
     3.2 +++ b/xen/arch/x86/domain_build.c	Wed Nov 16 12:23:17 2005 +0100
     3.3 @@ -639,7 +639,8 @@ int construct_dom0(struct domain *d,
     3.4      si->pt_base      = vpt_start;
     3.5      si->nr_pt_frames = nr_pt_pages;
     3.6      si->mfn_list     = vphysmap_start;
     3.7 -    sprintf(si->magic, "Xen-%i.%i", XEN_VERSION, XEN_SUBVERSION);
     3.8 +    sprintf(si->magic, "xen-%i.%i-x86_%d%s",
     3.9 +            XEN_VERSION, XEN_SUBVERSION, BITS_PER_LONG, xen_pae ? "p" : "");
    3.10  
    3.11      /* Write the phys->machine and machine->phys table entries. */
    3.12      for ( pfn = 0; pfn < d->tot_pages; pfn++ )
     4.1 --- a/xen/include/public/xen.h	Wed Nov 16 11:41:14 2005 +0100
     4.2 +++ b/xen/include/public/xen.h	Wed Nov 16 12:23:17 2005 +0100
     4.3 @@ -408,7 +408,7 @@ typedef struct shared_info {
     4.4  #define MAX_GUEST_CMDLINE 1024
     4.5  typedef struct start_info {
     4.6      /* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME.    */
     4.7 -    char magic[32];             /* "Xen-<version>.<subversion>". */
     4.8 +    char magic[32];             /* "xen-<version>-<platform>".            */
     4.9      unsigned long nr_pages;     /* Total pages allocated to this domain.  */
    4.10      unsigned long shared_info;  /* MACHINE address of shared info struct. */
    4.11      uint32_t flags;             /* SIF_xxx flags.                         */