[PATCH] More xenalyze type fixes

[PATCH] More xenalyze type fixes

[Jeremy Fitzhardinge]

Looks like you added some more type problems which break the 64-bit build.

Signed-of-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff -r 668cf7d7cc8c xenalyze.c
--- a/xenalyze.c	Thu May 06 16:27:50 2010 -0500
+++ b/xenalyze.c	Fri May 07 16:22:10 2010 -0700
@@ -4382,8 +4382,8 @@
     if ( opt.dump_all )
         printf(" %s npf gpa %llx q %x mfn %llx t %d\n",
                h->dump_header,
-               r->gpa, r->qualification,
-               r->mfn, r->p2mt);
+               (unsigned long long)r->gpa, r->qualification,
+               (unsigned long long)r->mfn, r->p2mt);
 }
 
 void hvm_generic_postprocess(struct hvm_data *h)
@@ -5741,7 +5741,7 @@
     case 2:
         if(sizeof(r->gpl2) != ri->extra_words * 4)
         {
-            fprintf(warn, "%s: expected %d bytes for %d-level guest, got %d!\n",
+            fprintf(warn, "%s: expected %zd bytes for %d-level guest, got %d!\n",
                     __func__, sizeof(r->gpl2), h->v->guest_paging_levels,
                     ri->extra_words * 4);
             dump_unexpected_and_exit(ri);
@@ -5754,7 +5754,7 @@
     case 3:
         if(sizeof(r->gpl3) != ri->extra_words * 4)
         {
-            fprintf(warn, "%s: expected %d bytes for %d-level guest, got %d!\n",
+            fprintf(warn, "%s: expected %zd bytes for %d-level guest, got %d!\n",
                     __func__, sizeof(r->gpl3), h->v->guest_paging_levels,
                     ri->extra_words * 4);
             dump_unexpected_and_exit(ri);
@@ -5767,7 +5767,7 @@
     case 4:
         if(sizeof(r->gpl4) != ri->extra_words * 4)
         {
-            fprintf(warn, "%s: expected %d bytes for %d-level guest, got %d!\n",
+            fprintf(warn, "%s: expected %zd bytes for %d-level guest, got %d!\n",
                     __func__, sizeof(r->gpl4), h->v->guest_paging_levels,
                     ri->extra_words * 4);
             dump_unexpected_and_exit(ri);
@@ -7086,7 +7086,7 @@
         printf(" %s set_p2m_entry d%d o%d g %llx m %llx\n",
                ri->dump_header,
                r->d, r->order,
-               r->gfn, r->mfn);
+               (unsigned long long)r->gfn, (unsigned long long)r->mfn);
     }
 }
 
@@ -7104,7 +7104,7 @@
         printf(" %s pod_populate d%d o%d g %llx m %llx\n",
                ri->dump_header,
                r->d, r->order,
-               r->gfn, r->mfn);
+               (unsigned long long)r->gfn, (unsigned long long)r->mfn);
     }
 }
 
@@ -7121,7 +7121,7 @@
     {
         printf(" %s pod_spage_splinter d%d g %llx\n",
                ri->dump_header,
-               r->d, r->gfn);
+               r->d, (unsigned long long)r->gfn);
     }
 }
 
@@ -7141,7 +7141,7 @@
                ri->dump_header,
                r->d, r->order,
                r->p2mt, 
-               r->gfn, r->mfn);
+               (unsigned long long)r->gfn, (unsigned long long)r->mfn);
     }
 }
 
@@ -7159,7 +7159,7 @@
         printf(" %s decrease_reservation d%d o%d g %llx\n",
                ri->dump_header,
                r->d, r->order,
-               r->gfn);
+               (unsigned long long)r->gfn);
     }
 }