1.1 --- a/tools/libxc/xc_linux_build.c	Tue Nov 08 16:48:42 2005 +0100
     1.2 +++ b/tools/libxc/xc_linux_build.c	Tue Nov 08 18:39:58 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", 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 @@ -626,7 +626,7 @@ 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", rc >> 16, rc & (0xFFFF));
    1.18      start_info->nr_pages     = nr_pages;
    1.19      start_info->shared_info  = shared_info_frame << PAGE_SHIFT;
    1.20      start_info->flags        = flags;

     2.1 --- a/xen/arch/x86/setup.c	Tue Nov 08 16:48:42 2005 +0100
     2.2 +++ b/xen/arch/x86/setup.c	Tue Nov 08 18:39:58 2005 +0100
     2.3 @@ -549,27 +549,27 @@ void arch_get_xen_caps(xen_capabilities_
     2.4  
     2.5  #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
     2.6  
     2.7 -    p += sprintf(p, "xen_%d.%d_x86_32 ", XEN_VERSION, XEN_SUBVERSION);
     2.8 +    p += sprintf(p, "xen-%d.%d-x86_32 ", XEN_VERSION, XEN_SUBVERSION);
     2.9      if ( hvm_enabled )
    2.10 -        p += sprintf(p, "hvm_%d.%d_x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.11 +        p += sprintf(p, "hvm-%d.%d-x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.12  
    2.13  #elif defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
    2.14  
    2.15 -    p += sprintf(p, "xen_%d.%d_x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.16 +    p += sprintf(p, "xen-%d.%d-x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.17      if ( hvm_enabled )
    2.18      {
    2.19 -        //p += sprintf(p, "hvm_%d.%d_x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.20 -        //p += sprintf(p, "hvm_%d.%d_x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.21 +        //p += sprintf(p, "hvm-%d.%d-x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.22 +        //p += sprintf(p, "hvm-%d.%d-x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.23      }
    2.24  
    2.25  #elif defined(CONFIG_X86_64)
    2.26  
    2.27 -    p += sprintf(p, "xen_%d.%d_x86_64 ", XEN_VERSION, XEN_SUBVERSION);
    2.28 +    p += sprintf(p, "xen-%d.%d-x86_64 ", XEN_VERSION, XEN_SUBVERSION);
    2.29      if ( hvm_enabled )
    2.30      {
    2.31 -        //p += sprintf(p, "hvm_%d.%d_x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.32 -        //p += sprintf(p, "hvm_%d.%d_x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.33 -        p += sprintf(p, "hvm_%d.%d_x86_64 ", XEN_VERSION, XEN_SUBVERSION);
    2.34 +        //p += sprintf(p, "hvm-%d.%d-x86_32 ", XEN_VERSION, XEN_SUBVERSION);
    2.35 +        //p += sprintf(p, "hvm-%d.%d-x86_32p ", XEN_VERSION, XEN_SUBVERSION);
    2.36 +        p += sprintf(p, "hvm-%d.%d-x86_64 ", XEN_VERSION, XEN_SUBVERSION);
    2.37      }
    2.38  
    2.39  #else