[LIBELF] Define PRIpfn next to xen_pfn_t.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
index b4f7727e793ea4947eea17264fbcf355d17a6156..98f8f11d7f137824f1637474c265924a41aedcea 100644 (file)
--- a/tools/libxc/xc_dom.h
+++ b/tools/libxc/xc_dom.h
@@ -7,11 +7,6 @@
 typedef uint64_t xen_vaddr_t;
 typedef uint64_t xen_paddr_t;
 
-/* FIXME: temporary hack ... */
-#ifndef PRIpfn
-#define PRIpfn "lx"
-#endif
-
 struct xc_dom_seg {
     xen_vaddr_t vstart;
     xen_vaddr_t vend;

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index ac8292d2a0ddf734bc49bdf6650f4117e3fc0d84..49b9b15d77f36aaf5faa4ac7f56167f80cbb7435 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -55,6 +55,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
+#define PRIpfn "lx"
 #endif
 
 /* Arch specific VIRQs definition */

diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h
index add1d4ce2ffbb2cf65bc5cf767d469f2fa57c64f..a6280745a3a63fb8d5679bd010499fe6c7607b7b 100644 (file)
--- a/xen/include/public/arch-powerpc.h
+++ b/xen/include/public/arch-powerpc.h
@@ -56,6 +56,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
+#define PRIpfn "llx"
 #endif
 
 /*

diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index f62874c04a4d9bb37ce51eaf061887abfc045f21..8053262672c4874902ed5e104110755b65c8a59f 100644 (file)
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -61,6 +61,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
+#define PRIpfn "lx"
 #endif
 
 /*