# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID fb50fba1895c3954f7d7bcecbc37221c58f235ff
# Parent fa99d895bb187dc2b995d054fb93d000bf249a71
Fix up start_info_t magic string to match the format of
XENVER_capabilities strings.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r fa99d895bb18 -r fb50fba1895c tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Wed Nov 16 10:41:14 2005
+++ b/tools/libxc/xc_linux_build.c Wed Nov 16 11:23:17 2005
@@ -351,7 +351,7 @@
xc_handle, dom, PAGE_SIZE, PROT_READ|PROT_WRITE, page_array[0]);
memset(start_info, 0, sizeof(*start_info));
rc = xc_version(xc_handle, XENVER_version, NULL);
- sprintf(start_info->magic, "xen-%i.%i", rc >> 16, rc & (0xFFFF));
+ sprintf(start_info->magic, "xen-%i.%i-ia64", rc >> 16, rc & (0xFFFF));
start_info->flags = flags;
start_info->store_mfn = nr_pages - 2;
start_info->store_evtchn = store_evtchn;
@@ -628,7 +628,9 @@
page_array[(vstartinfo_start-dsi.v_start)>>PAGE_SHIFT]);
memset(start_info, 0, sizeof(*start_info));
rc = xc_version(xc_handle, XENVER_version, NULL);
- sprintf(start_info->magic, "xen-%i.%i", rc >> 16, rc & (0xFFFF));
+ sprintf(start_info->magic, "xen-%i.%i-x86_%d%s",
+ rc >> 16, rc & (0xFFFF), sizeof(long)*8,
+ dsi.pae_kernel ? "p" : "");
start_info->nr_pages = nr_pages;
start_info->shared_info = shared_info_frame << PAGE_SHIFT;
start_info->flags = flags;
diff -r fa99d895bb18 -r fb50fba1895c xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Wed Nov 16 10:41:14 2005
+++ b/xen/arch/ia64/xen/domain.c Wed Nov 16 11:23:17 2005
@@ -952,7 +952,7 @@
si = (start_info_t *)alloc_xenheap_page();
memset(si, 0, PAGE_SIZE);
d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT;
- sprintf(si->magic, "Xen-%i.%i", XEN_VERSION, XEN_SUBVERSION);
+ sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
#if 0
si->nr_pages = d->tot_pages;
diff -r fa99d895bb18 -r fb50fba1895c xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Wed Nov 16 10:41:14 2005
+++ b/xen/arch/x86/domain_build.c Wed Nov 16 11:23:17 2005
@@ -639,7 +639,8 @@
si->pt_base = vpt_start;
si->nr_pt_frames = nr_pt_pages;
si->mfn_list = vphysmap_start;
- sprintf(si->magic, "Xen-%i.%i", XEN_VERSION, XEN_SUBVERSION);
+ sprintf(si->magic, "xen-%i.%i-x86_%d%s",
+ XEN_VERSION, XEN_SUBVERSION, BITS_PER_LONG, xen_pae ? "p" : "");
/* Write the phys->machine and machine->phys table entries. */
for ( pfn = 0; pfn < d->tot_pages; pfn++ )
diff -r fa99d895bb18 -r fb50fba1895c xen/include/public/xen.h
--- a/xen/include/public/xen.h Wed Nov 16 10:41:14 2005
+++ b/xen/include/public/xen.h Wed Nov 16 11:23:17 2005
@@ -408,7 +408,7 @@
#define MAX_GUEST_CMDLINE 1024
typedef struct start_info {
/* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME. */
- char magic[32]; /* "Xen-<version>.<subversion>". */
+ char magic[32]; /* "xen-<version>-<platform>". */
unsigned long nr_pages; /* Total pages allocated to this domain. */
unsigned long shared_info; /* MACHINE address of shared info struct. */
uint32_t flags; /* SIF_xxx flags. */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home