From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Hoes Subject: [PATCH v6 09/11] libxl: ocaml: add some missing CAML macros Date: Mon, 9 Dec 2013 15:17:28 +0000 Message-ID: <1386602250-29866-10-git-send-email-rob.hoes@citrix.com> References: <1386602250-29866-1-git-send-email-rob.hoes@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1386602250-29866-1-git-send-email-rob.hoes@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Rob Hoes , ian.jackson@eu.citrix.com, dave.scott@eu.citrix.com, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 5d8f039..2c24ea2 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -59,6 +59,7 @@ static value Val_error (libxl_error error_c); static void failwith_xl(int error, char *fname) { + CAMLparam0(); CAMLlocal1(arg); static value *exc = NULL; @@ -75,6 +76,7 @@ static void failwith_xl(int error, char *fname) Store_field(arg, 1, caml_copy_string(fname)); caml_raise_with_arg(*exc, arg); + CAMLreturn0; } CAMLprim value stub_raise_exception(value unit) @@ -338,7 +340,7 @@ static libxl_defbool Defbool_val(value v) bool b = Bool_val(Some_val(v)); libxl_defbool_set(&db, b); } - return db; + CAMLreturnT(libxl_defbool, db); } static value Val_hwcap(libxl_hwcap *c_val) @@ -369,10 +371,11 @@ static value Val_string_option(const char *c_val) static char *String_option_val(value v) { + CAMLparam1(v); char *s = NULL; if (v != Val_none) s = dup_String_val(Some_val(v)); - return s; + CAMLreturnT(char *, s); } #include "_libxl_types.inc" -- 1.7.10.4