xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Rob Hoes <rob.hoes@citrix.com>
To: xen-devel@lists.xen.org
Cc: Rob Hoes <rob.hoes@citrix.com>,
	ian.jackson@eu.citrix.com, ian.campbell@citrix.com,
	dave.scott@eu.citrix.com
Subject: [PATCH v7 9/9] libxl: ocaml: add some missing CAML macros
Date: Tue, 10 Dec 2013 16:48:33 +0000	[thread overview]
Message-ID: <1386694113-26721-10-git-send-email-rob.hoes@citrix.com> (raw)
In-Reply-To: <1386694113-26721-1-git-send-email-rob.hoes@citrix.com>

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Acked-by: David Scott <dave.scott@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 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 48a3feb..a923694 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

  parent reply	other threads:[~2013-12-10 16:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-10 16:48 libxl: ocaml: improve the bindings Rob Hoes
2013-12-10 16:48 ` [PATCH v7 1/9] libxl: ocaml: add simple test case for xentoollog Rob Hoes
2013-12-10 16:48 ` [PATCH v7 2/9] libxl: ocaml: implement some simple tests Rob Hoes
2013-12-10 16:48 ` [PATCH v7 3/9] libxl: ocaml: event management Rob Hoes
2013-12-11 13:07   ` Ian Campbell
2013-12-10 16:48 ` [PATCH v7 4/9] libxl: ocaml: allow device operations to be called asynchronously Rob Hoes
2013-12-10 16:48 ` [PATCH v7 5/9] libxl: ocaml: add disk and cdrom helper functions Rob Hoes
2013-12-10 16:48 ` [PATCH v7 6/9] libxl: ocaml: add VM lifecycle operations Rob Hoes
2013-12-10 16:48 ` [PATCH v7 7/9] libxl: ocaml: add console reader functions Rob Hoes
2013-12-10 16:48 ` [PATCH v7 8/9] libxl: ocaml: drop the ocaml heap lock before calling into libxl Rob Hoes
2013-12-10 16:48 ` Rob Hoes [this message]
2013-12-11 13:37 ` libxl: ocaml: improve the bindings Ian Campbell
2013-12-11 13:57   ` Rob Hoes
2013-12-11 14:11     ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386694113-26721-10-git-send-email-rob.hoes@citrix.com \
    --to=rob.hoes@citrix.com \
    --cc=dave.scott@eu.citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).