Re: [Xen-ia64-devel] RE: Xen install (tip)

[Tristan Gingold <Tristan.Gingold@xxxxxxxx>]

Le Mercredi 12 Octobre 2005 15:48, Magenheimer, Dan (HP Labs Fort Collins) a 
écrit :
[...]
> I believe Kevin will be looking at this when he returns from
> vacation.   As long as your updated SMP patch doesn't break the
> uniprocessor boot of domain0, let's go ahead and start
> integrating it into tip.

Here is a small changeset with which I compiled tools on ia64.

It is correctly signed ?

Tristan.

# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID 276744d6f43efc3a2f885d5ade6b9a56733df81c
# Parent  74d56b7ff46cb07fbf7dbb72cad4e14e9d22324f
Modify to be able to compile on ia64.
Width arguments of printf ("%*") should be an int.

diff -r 74d56b7ff46c -r 276744d6f43e tools/libxc/xc_ia64_stubs.c
--- a/tools/libxc/xc_ia64_stubs.c       Tue Oct 11 22:57:44 2005
+++ b/tools/libxc/xc_ia64_stubs.c       Wed Oct 12 12:51:31 2005
@@ -17,17 +17,14 @@
 }
 
 int xc_vmx_build(int xc_handle,
-                   u32 domid,
-                   int memsize,
-                   const char *image_name,
-                   struct mem_map *mem_mapp,
-                   const char *ramdisk_name,
-                   const char *cmdline,
-                   unsigned int control_evtchn,
-                   unsigned long flags,
-                   unsigned int vcpus,
-                   unsigned int store_evtchn,
-                   unsigned long *store_mfn)
+                 uint32_t domid,
+                 int memsize,
+                 const char *image_name,
+                 unsigned int control_evtchn,
+                 unsigned long flags,
+                 unsigned int vcpus,
+                 unsigned int store_evtchn,
+                 unsigned long *store_mfn)
 {
     PERROR("xc_vmx_build not implemented\n");
     return -1;
diff -r 74d56b7ff46c -r 276744d6f43e tools/xenstore/xs_tdb_dump.c
--- a/tools/xenstore/xs_tdb_dump.c      Tue Oct 11 22:57:44 2005
+++ b/tools/xenstore/xs_tdb_dump.c      Wed Oct 12 12:51:31 2005
@@ -53,17 +53,17 @@
                hdr = (void *)data.dptr;
                if (data.dsize < sizeof(*hdr))
                        fprintf(stderr, "%.*s: BAD truncated\n",
-                               key.dsize, key.dptr);
+                               (int)key.dsize, key.dptr);
                else if (data.dsize != total_size(hdr))
                        fprintf(stderr, "%.*s: BAD length %i for %i/%i/%i 
(%i)\n",
-                               key.dsize, key.dptr, data.dsize,
+                               (int)key.dsize, key.dptr, (int)data.dsize,
                                hdr->num_perms, hdr->datalen,
                                hdr->childlen, total_size(hdr));
                else {
                        unsigned int i;
                        char *p;
 
-                       printf("%.*s: ", key.dsize, key.dptr);
+                       printf("%.*s: ", (int)key.dsize, key.dptr);
                        for (i = 0; i < hdr->num_perms; i++)
                                printf("%s%c%i",
                                       i == 0 ? "" : ",",
diff -r 74d56b7ff46c -r 276744d6f43e tools/xenstore/xsls.c
--- a/tools/xenstore/xsls.c     Tue Oct 11 22:57:44 2005
+++ b/tools/xenstore/xsls.c     Wed Oct 12 12:51:31 2005
@@ -25,7 +25,7 @@
         if (val == NULL)
             printf(":\n");
         else if ((unsigned)len > (151 - strlen(e[i])))
-            printf(" = \"%.*s...\"\n", 148 - strlen(e[i]), val);
+            printf(" = \"%.*s...\"\n", 148 - (int)strlen(e[i]), val);
         else
             printf(" = \"%s\"\n", val);
         free(val);


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