diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2007-11-20 13:11:29 +0000 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2007-11-20 13:11:29 +0000 |
commit | 38e7a75efaab8a6a709cbad8342bca4a45ead8cc (patch) | |
tree | 30e6333289aee0b2237d3684d69bfff016079693 /libvirt/libvirt.ml | |
parent | 9a4b8fc45a07dfb0bb1e388d1991673db776baae (diff) | |
download | virt-top-38e7a75efaab8a6a709cbad8342bca4a45ead8cc.tar.gz virt-top-38e7a75efaab8a6a709cbad8342bca4a45ead8cc.tar.xz virt-top-38e7a75efaab8a6a709cbad8342bca4a45ead8cc.zip |
* libvirt/libvirt.mli, libvirt/libvirt.ml: New error numbers
in base libvirt.
* libvirt/libvirt_c.c: Gracefully handle the case where libvirt
throws an error number we have not heard of before (eg. when
dynamic linking with newer libvirt).
* configure.ac: Check <libvirt/virterror.h> exists.
* configure.ac: Version 0.3.3.4.
Diffstat (limited to 'libvirt/libvirt.ml')
-rw-r--r-- | libvirt/libvirt.ml | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml index 586aa7b..69e1c0d 100644 --- a/libvirt/libvirt.ml +++ b/libvirt/libvirt.ml @@ -260,6 +260,8 @@ struct | VIR_WAR_NO_NETWORK | VIR_ERR_NO_DOMAIN | VIR_ERR_NO_NETWORK + | VIR_ERR_INVALID_MAC + | VIR_ERR_UNKNOWN of int let string_of_code = function | VIR_ERR_OK -> "VIR_ERR_OK" @@ -306,16 +308,8 @@ struct | VIR_WAR_NO_NETWORK -> "VIR_WAR_NO_NETWORK" | VIR_ERR_NO_DOMAIN -> "VIR_ERR_NO_DOMAIN" | VIR_ERR_NO_NETWORK -> "VIR_ERR_NO_NETWORK" - - type level = - | VIR_ERR_NONE - | VIR_ERR_WARNING - | VIR_ERR_ERROR - - let string_of_level = function - | VIR_ERR_NONE -> "VIR_ERR_NONE" - | VIR_ERR_WARNING -> "VIR_ERR_WARNING" - | VIR_ERR_ERROR -> "VIR_ERR_ERROR" + | VIR_ERR_INVALID_MAC -> "VIR_ERR_INVALID_MAC" + | VIR_ERR_UNKNOWN i -> "VIR_ERR_" ^ string_of_int i type domain = | VIR_FROM_NONE @@ -333,6 +327,9 @@ struct | VIR_FROM_TEST | VIR_FROM_REMOTE | VIR_FROM_OPENVZ + | VIR_FROM_XENXM + | VIR_FROM_STATS_LINUX + | VIR_FROM_UNKNOWN of int let string_of_domain = function | VIR_FROM_NONE -> "VIR_FROM_NONE" @@ -350,6 +347,21 @@ struct | VIR_FROM_TEST -> "VIR_FROM_TEST" | VIR_FROM_REMOTE -> "VIR_FROM_REMOTE" | VIR_FROM_OPENVZ -> "VIR_FROM_OPENVZ" + | VIR_FROM_XENXM -> "VIR_FROM_XENXM" + | VIR_FROM_STATS_LINUX -> "VIR_FROM_STATS_LINUX" + | VIR_FROM_UNKNOWN i -> "VIR_FROM_" ^ string_of_int i + + type level = + | VIR_ERR_NONE + | VIR_ERR_WARNING + | VIR_ERR_ERROR + | VIR_ERR_UNKNOWN_LEVEL of int + + let string_of_level = function + | VIR_ERR_NONE -> "VIR_ERR_NONE" + | VIR_ERR_WARNING -> "VIR_ERR_WARNING" + | VIR_ERR_ERROR -> "VIR_ERR_ERROR" + | VIR_ERR_UNKNOWN_LEVEL i -> "VIR_ERR_LEVEL_" ^ string_of_int i type t = { code : code; |