WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] ocaml: fix ocaml xc compilation on 32 bit

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] ocaml: fix ocaml xc compilation on 32 bit
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 21 May 2010 08:25:12 -0700
Delivery-date: Fri, 21 May 2010 08:26:55 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1274361134 -3600
# Node ID c2155204075d14fd5d56de2b6394044298626d69
# Parent  11a3bf0e568ebc1e167740f51713a4a05e4e136d
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@xxxxxxxxxx>
---
 tools/ocaml/libs/xc/xc.h       |    2 +-
 tools/ocaml/libs/xc/xc_lib.c   |    2 +-
 tools/ocaml/libs/xc/xc_stubs.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff -r 11a3bf0e568e -r c2155204075d tools/ocaml/libs/xc/xc.h
--- a/tools/ocaml/libs/xc/xc.h  Thu May 20 14:10:07 2010 +0100
+++ b/tools/ocaml/libs/xc/xc.h  Thu May 20 14:12:14 2010 +0100
@@ -141,7 +141,7 @@ int xc_shadow_allocation_set(int handle,
 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 -r 11a3bf0e568e -r c2155204075d tools/ocaml/libs/xc/xc_lib.c
--- a/tools/ocaml/libs/xc/xc_lib.c      Thu May 20 14:10:07 2010 +0100
+++ b/tools/ocaml/libs/xc/xc_lib.c      Thu May 20 14:12:14 2010 +0100
@@ -1208,7 +1208,7 @@ int xc_shadow_allocation_set(int handle,
 }
 
 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 -r 11a3bf0e568e -r c2155204075d tools/ocaml/libs/xc/xc_stubs.c
--- a/tools/ocaml/libs/xc/xc_stubs.c    Thu May 20 14:10:07 2010 +0100
+++ b/tools/ocaml/libs/xc/xc_stubs.c    Thu May 20 14:12:14 2010 +0100
@@ -952,11 +952,11 @@ CAMLprim value stub_xc_domain_get_pfn_li
        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();
 

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] ocaml: fix ocaml xc compilation on 32 bit, Xen patchbot-unstable <=