From: Rob Hoes <rob.hoes@citrix.com>
To: xen-devel@lists.xen.org
Cc: ian.jackson@eu.citrix.com, ian.campbell@citrix.com,
Rob Hoes <rob.hoes@citrix.com>
Subject: [PATCH v3-RESEND 09/28] libxl: make the libxl error type an IDL enum
Date: Mon, 21 Oct 2013 14:32:26 +0100 [thread overview]
Message-ID: <1382362365-6645-10-git-send-email-rob.hoes@citrix.com> (raw)
In-Reply-To: <1382362365-6645-1-git-send-email-rob.hoes@citrix.com>
This makes it easier to use in language bindings.
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
---
New in v3:
* New patch to simplify the (following) exception handling patch.
---
tools/libxl/libxl.h | 18 ------------------
tools/libxl/libxl_device.c | 6 +++---
tools/libxl/libxl_types.idl | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 1c6675d..9379694 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -459,24 +459,6 @@ typedef struct libxl__ctx libxl_ctx;
const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx);
-enum {
- ERROR_NONSPECIFIC = -1,
- ERROR_VERSION = -2,
- ERROR_FAIL = -3,
- ERROR_NI = -4,
- ERROR_NOMEM = -5,
- ERROR_INVAL = -6,
- ERROR_BADFAIL = -7,
- ERROR_GUEST_TIMEDOUT = -8,
- ERROR_TIMEDOUT = -9,
- ERROR_NOPARAVIRT = -10,
- ERROR_NOT_READY = -11,
- ERROR_OSEVENT_REG_FAIL = -12,
- ERROR_BUFFERFULL = -13,
- ERROR_UNKNOWN_CHILD = -14,
-};
-
-
/*
* Some libxl operations can take a long time. These functions take a
* parameter to control their concurrency:
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 16a92a4..11c53cf 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -497,7 +497,7 @@ static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev)
{
STATE_AO_GC(aodev->ao);
libxl__multidev *multidev = aodev->multidev;
- int i, error = 0;
+ int i, err = 0;
aodev->active = 0;
@@ -506,10 +506,10 @@ static void multidev_one_callback(libxl__egc *egc, libxl__ao_device *aodev)
return;
if (multidev->array[i]->rc)
- error = multidev->array[i]->rc;
+ err = multidev->array[i]->rc;
}
- multidev->callback(egc, multidev, error);
+ multidev->callback(egc, multidev, err);
return;
}
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 5c43d6f..778a416 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -28,6 +28,23 @@ MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT")
# Constants / Enumerations
#
+libxl_error = Enumeration("error", [
+ (-1, "NONSPECIFIC"),
+ (-2, "VERSION"),
+ (-3, "FAIL"),
+ (-4, "NI"),
+ (-5, "NOMEM"),
+ (-6, "INVAL"),
+ (-7, "BADFAIL"),
+ (-8, "GUEST_TIMEDOUT"),
+ (-9, "TIMEDOUT"),
+ (-10, "NOPARAVIRT"),
+ (-11, "NOT_READY"),
+ (-12, "OSEVENT_REG_FAIL"),
+ (-13, "BUFFERFULL"),
+ (-14, "UNKNOWN_CHILD"),
+ ], namespace = "")
+
libxl_domain_type = Enumeration("domain_type", [
(-1, "INVALID"),
(1, "HVM"),
--
1.7.10.4
next prev parent reply other threads:[~2013-10-21 13:32 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 13:32 libxl: ocaml: improve the bindings Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 01/28] libxl: idl: allow KeyedUnion members to be empty Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 02/28] libxl: ocaml: support for Arrays in bindings generator Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 03/28] libxl: ocaml: avoid reserved words in type and field names Rob Hoes
2013-10-24 22:04 ` Ian Campbell
2013-10-24 22:11 ` Rob Hoes
2013-10-25 6:56 ` Ian Campbell
2013-10-25 8:44 ` Rob Hoes
2013-10-28 15:24 ` Ian Jackson
2013-10-31 13:43 ` Ian Campbell
2013-10-31 14:27 ` Ian Jackson
2013-10-31 17:20 ` Ian Campbell
2013-11-04 14:59 ` Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 04/28] libxl: ocaml: support for KeyedUnion in the bindings generator Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 05/28] libxl: ocaml: add some more builtin types Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 06/28] libxc: ocaml: add simple binding for xentoollog (output only) Rob Hoes
2013-11-13 13:45 ` Ian Campbell
2013-11-14 14:11 ` Rob Hoes
2013-11-15 11:48 ` Andrew Cooper
2013-10-21 13:32 ` [PATCH v3-RESEND 07/28] libxl: ocaml: allocate a long lived libxl context Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 08/28] libxl: ocaml: switch all functions over to take a context Rob Hoes
2013-10-21 13:32 ` Rob Hoes [this message]
2013-10-31 18:07 ` [PATCH v3-RESEND 09/28] libxl: make the libxl error type an IDL enum Ian Campbell
2013-11-04 14:48 ` Rob Hoes
2013-11-04 15:05 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 10/28] libxl: ocaml: generate string_of_* functions for enums Rob Hoes
2013-10-31 18:13 ` Ian Campbell
2013-11-06 10:30 ` Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 11/28] libxl: ocaml: propagate the libxl return error code in exceptions Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 12/28] libxl: ocaml: make Val_defbool GC-proof Rob Hoes
2013-10-31 18:15 ` Ian Campbell
2013-10-31 18:55 ` Ian Jackson
2013-10-31 18:57 ` Ian Jackson
2013-10-31 19:10 ` Ian Campbell
2013-10-31 19:42 ` Dave Scott
2013-10-31 19:19 ` Ian Jackson
2013-10-21 13:32 ` [PATCH v3-RESEND 13/28] libxl: ocaml: add domain_build/create_info/config and events to the bindings Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 14/28] libxl: ocaml: add META to list of generated files in Makefile Rob Hoes
2013-10-31 18:47 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 15/28] libxl: ocaml: fix the handling of enums in the bindings generator Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 16/28] libxl: ocaml: use the "string option" type for IDL strings Rob Hoes
2013-10-31 18:18 ` Ian Campbell
2013-10-31 18:48 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 17/28] libxl: ocaml: add dominfo_list and dominfo_get Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 18/28] libxl: ocaml: implement some simple tests Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 19/28] libxl: ocaml: event management Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 20/28] libxl: ocaml: allow device operations to be called asynchronously Rob Hoes
2013-10-31 18:21 ` Ian Campbell
2013-11-06 11:46 ` Rob Hoes
2013-11-06 12:02 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 21/28] libxl: ocaml: add NIC helper functions Rob Hoes
2013-10-31 18:23 ` Ian Campbell
2013-11-06 11:55 ` Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 22/28] libxl: ocaml: add PCI device " Rob Hoes
2013-10-31 18:24 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 23/28] libxl: ocaml: add disk and cdrom " Rob Hoes
2013-10-31 18:25 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 24/28] libxl: ocaml: add VM lifecycle operations Rob Hoes
2013-10-31 18:36 ` Ian Campbell
2013-11-06 12:20 ` Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 25/28] libxl: ocaml: in send_debug_keys, clean up before raising exception Rob Hoes
2013-10-31 18:38 ` Ian Campbell
2013-11-06 13:56 ` Rob Hoes
2013-10-21 13:32 ` [PATCH v3-RESEND 26/28] libxl: ocaml: provide defaults for libxl types Rob Hoes
2013-10-31 18:43 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 27/28] libxl: ocaml: use CAMLlocal1 macro rather than value-type in auto-generated C-code Rob Hoes
2013-10-31 18:48 ` Ian Campbell
2013-10-21 13:32 ` [PATCH v3-RESEND 28/28] libxl: ocaml: add console reader functions Rob Hoes
2013-10-31 18:45 ` Ian Campbell
2013-10-23 11:33 ` libxl: ocaml: improve the bindings David Scott
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=1382362365-6645-10-git-send-email-rob.hoes@citrix.com \
--to=rob.hoes@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).