From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 20 May 2010 13:12:14 +0000 (+0100)
Subject: ocaml: fix ocaml xc compilation on 32 bit
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12103
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ceba28edd5687553f9a72f4336de521ce5d6b818;p=xen.git

ocaml: fix ocaml xc compilation on 32 bit

  cc1: warnings being treated as errors
  xc_lib.c: In function 'xc_domain_get_pfn_list':
  xc_lib.c:1217: error: assignment from incompatible pointer type

The XEN_DOMCTL_getmemlist interface has been 32/64 invariante since
13594:30af6cfdb05c and uint64_t is now the correct type for the PFN
list on all word sizes.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/ocaml/libs/xc/xc.h b/tools/ocaml/libs/xc/xc.h
index ac3307a1e7..b541c94003 100644
--- a/tools/ocaml/libs/xc/xc.h
+++ b/tools/ocaml/libs/xc/xc.h
@@ -141,7 +141,7 @@ int xc_shadow_allocation_get(int handle, unsigned int domid,
 int xc_shadow_allocation_set(int handle, unsigned int domid,
 			     uint32_t mb);
 int xc_domain_get_pfn_list(int handle, unsigned int domid,
-                           xen_pfn_t *pfn_array, unsigned long max_pfns);
+                           uint64_t *pfn_array, unsigned long max_pfns);
 int xc_hvm_check_pvdriver(int handle, unsigned int domid);
 
 int xc_domain_assign_device(int handle, unsigned int domid,
diff --git a/tools/ocaml/libs/xc/xc_lib.c b/tools/ocaml/libs/xc/xc_lib.c
index 981ab7bdc9..7d33ce8ee4 100644
--- a/tools/ocaml/libs/xc/xc_lib.c
+++ b/tools/ocaml/libs/xc/xc_lib.c
@@ -1208,7 +1208,7 @@ int xc_shadow_allocation_set(int handle, unsigned int domid, uint32_t mb)
 }
 
 int xc_domain_get_pfn_list(int handle, unsigned int domid,
-                           xen_pfn_t *pfn_array, unsigned long max_pfns)
+                           uint64_t *pfn_array, unsigned long max_pfns)
 {
 	int ret;
 	DECLARE_DOMCTL(XEN_DOMCTL_getmemlist, domid);
diff --git a/tools/ocaml/libs/xc/xc_stubs.c b/tools/ocaml/libs/xc/xc_stubs.c
index 02dc1ad87a..c9fb0a83ab 100644
--- a/tools/ocaml/libs/xc/xc_stubs.c
+++ b/tools/ocaml/libs/xc/xc_stubs.c
@@ -952,11 +952,11 @@ CAMLprim value stub_xc_domain_get_pfn_list(value xc_handle, value domid,
 	CAMLlocal2(array, v);
 	unsigned long c_nr_pfns;
 	long ret, i;
-	xen_pfn_t *c_array;
+	uint64_t *c_array;
 
 	c_nr_pfns = Nativeint_val(nr_pfns);
 
-	c_array = malloc(sizeof(xen_pfn_t) * c_nr_pfns);
+	c_array = malloc(sizeof(uint64_t) * c_nr_pfns);
 	if (!c_array)
 		caml_raise_out_of_memory();