libxl: fix compilation on ARM

Commit Message

Wei Liu April 2, 2016, 12:36 a.m. UTC

COLO introduced a few callbacks. The original implementation used
unsigned long for a type which in fact should be xen_pfn_t. That broke
libxl compilation on ARM, because xen_pfn_t is not a synonym for
unsigned long on ARM platform.

Fixing this requires modifying the perl script. Specifically now we need
to include xenctrl.h in helper header file so that we can use xen_pfn_t
there.

Reported-by: Olaf Hering <[e-mail]>
Signed-off-by: Wei Liu <[e-mail]>
---
Cc: Ian Jackson <[e-mail]>
Cc: Wen Congyang <[e-mail]>
Cc: Changlong Xie <[e-mail]>

Compile test only. Please review carefully.
---
 tools/libxl/libxl_create.c         |  4 ++--
 tools/libxl/libxl_save_msgs_gen.pl | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

Patch

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 6882ff8..4b02de9 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1109,8 +1109,8 @@  static void domcreate_bootloader_done(libxl__egc *egc,
     domcreate_stream_done(egc, &dcs->srs, rc);
 }
 
-void libxl__srm_callout_callback_restore_results(unsigned long store_mfn,
-          unsigned long console_mfn, void *user)
+void libxl__srm_callout_callback_restore_results(xen_pfn_t store_mfn,
+          xen_pfn_t console_mfn, void *user)
 {
     libxl__save_helper_state *shs = user;
     libxl__domain_create_state *dcs = shs->caller_state;
diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl
index c2243f2..25728aa 100755
--- a/tools/libxl/libxl_save_msgs_gen.pl
+++ b/tools/libxl/libxl_save_msgs_gen.pl
@@ -29,8 +29,8 @@  our @msgs = (
     [  6, 'srcxA',  "wait_checkpoint", [] ],
     [  7, 'scxA',   "switch_qemu_logdirty",  [qw(int domid
                                               unsigned enable)] ],
-    [  8, 'rcx',    "restore_results",       ['unsigned long', 'store_gfn',
-                                              'unsigned long', 'console_gfn'] ],
+    [  8, 'rcx',    "restore_results",       ['xen_pfn_t', 'store_gfn',
+                                              'xen_pfn_t', 'console_gfn'] ],
     [  9, 'srW',    "complete",              [qw(int retval
                                                  int errnoval)] ],
 );
@@ -41,6 +41,7 @@  our %cbs;
 our %func;
 our %func_ah;
 our @outfuncs;
+our %out_incls;
 our %out_decls;
 our %out_body;
 our %msgnum_used;
@@ -71,10 +72,14 @@  END_BOTH
 END_CALLOUT
 
 #include "_libxl_save_msgs_${ah}.h"
-#include <xenctrl.h>
 #include <xenguest.h>
 
 END_HELPER
+
+    $out_incls{$ah} .= $ah eq 'helper' ? <<END : "";
+#include <xenctrl.h>
+
+END
 }
 
 die $want_ah unless defined $out_body{$want_ah};
@@ -141,7 +146,7 @@  static void bytes_put(unsigned char *const buf, int *len,
 
 END
 
-foreach my $simpletype (qw(int uint16_t uint32_t unsigned), 'unsigned long') {
+foreach my $simpletype (qw(int uint16_t uint32_t unsigned), 'unsigned long', 'xen_pfn_t') {
     my $typeid = typeid($simpletype);
     $out_body{'callout'} .= <<END;
 static int ${typeid}_get(const unsigned char **msg,
@@ -363,6 +368,10 @@  END_ALWAYS
 
 print "/* AUTOGENERATED by $0 DO NOT EDIT */\n\n" or die $!;
 
+if ($ch eq 'h') {
+    print $out_incls{$want_ah} or die $!;
+}
+
 foreach my $sr (qw(save restore)) {
     f_more("${enumcallbacks}_${sr}",
            "    return cbflags;\n");