From 68fae1ec3de46fd9eec88fb7c1894ea7ed85ccc9 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Tue, 17 Mar 2015 12:51:50 +0000

Subject: [PATCH 1/2] Suppress errors to stderr and use thread-local

 virErrorPtr

This allows us to capture errors that happen during virConnectOpen,

without spewing error messages on stderr.

The patch is rather large, only because we don't need to pass the

virConnectPtr argument to CHECK_ERROR/_raise_virterror any longer.

---

 libvirt/generator.pl         |  66 ++++++------

 libvirt/libvirt_c.c          | 241 +++++++++++++++++--------------------------

 libvirt/libvirt_c_epilogue.c |   4 +-

 libvirt/libvirt_c_oneoffs.c  |  94 +++++++----------

 libvirt/libvirt_c_prologue.c |   6 +-

 5 files changed, 169 insertions(+), 242 deletions(-)

diff --git a/libvirt/generator.pl b/libvirt/generator.pl

index 421592b..34801ba 100755

--- a/libvirt/generator.pl

+++ b/libvirt/generator.pl

@@ -343,17 +343,13 @@ sub gen_unpack_args

     if ($_ eq "conn") {

 	"virConnectPtr conn = Connect_val (connv);"

     } elsif ($_ eq "dom") {

-	"virDomainPtr dom = Domain_val (domv);\n".

-	"  virConnectPtr conn = Connect_domv (domv);"

+	"virDomainPtr dom = Domain_val (domv);"

     } elsif ($_ eq "net") {

-	"virNetworkPtr net = Network_val (netv);\n".

-	"  virConnectPtr conn = Connect_netv (netv);"

+	"virNetworkPtr net = Network_val (netv);"

     } elsif ($_ eq "pool") {

-	"virStoragePoolPtr pool = Pool_val (poolv);\n".

-	"  virConnectPtr conn = Connect_polv (poolv);"

+	"virStoragePoolPtr pool = Pool_val (poolv);"

     } elsif ($_ eq "vol") {

-	"virStorageVolPtr vol = Volume_val (volv);\n".

-	"  virConnectPtr conn = Connect_volv (volv);"

+	"virStorageVolPtr vol = Volume_val (volv);"

     } else {

 	die "unknown short name $_"

     }

@@ -402,7 +398,7 @@ sub gen_c_code

   char *r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   rv = caml_copy_string (r);

   free (r);

@@ -415,7 +411,7 @@ sub gen_c_code

   const char *r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   rv = caml_copy_string (r);

   CAMLreturn (rv);

@@ -426,7 +422,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_int (r));

 "

@@ -438,7 +434,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, uuid));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   /* UUIDs are byte arrays with a fixed length. */

   rv = caml_alloc_string (VIR_UUID_BUFLEN);

@@ -453,7 +449,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, uuid));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   rv = caml_copy_string (uuid);

   CAMLreturn (rv);

@@ -464,7 +460,7 @@ sub gen_c_code

   int r, b;

   NONBLOCKING (r = $c_name ($1, &b);;

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (b ? Val_true : Val_false);

 "

@@ -476,7 +472,7 @@ sub gen_c_code

   b = bv == Val_true ? 1 : 0;

   NONBLOCKING (r = $c_name ($1, b));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -498,7 +494,7 @@ sub gen_c_code

   }

   NONBLOCKING (r = $c_name (conn, ids, i));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i)

@@ -525,7 +521,7 @@ sub gen_c_code

   }

   NONBLOCKING (r = $c_name ($1, names, i));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -543,7 +539,7 @@ sub gen_c_code

   char *r;

   NONBLOCKING (r = $c_name ($1, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   rv = caml_copy_string (r);

   free (r);

@@ -555,7 +551,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, 0));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -565,7 +561,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -575,7 +571,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   /* So that we don't double-free in the finalizer: */

   " . gen_free_arg ($1) . "

@@ -589,7 +585,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, str));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -601,7 +597,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, str, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -614,7 +610,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, str));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -629,7 +625,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, str, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -645,7 +641,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, str, u));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -659,7 +655,7 @@ sub gen_c_code

   int r;

   NONBLOCKING (r = $c_name ($1, i));

-  CHECK_ERROR (r == -1, conn, \"$c_name\");

+  CHECK_ERROR (r == -1, \"$c_name\");

   CAMLreturn (Val_unit);

 "

@@ -673,7 +669,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, i));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($3) . "

@@ -688,7 +684,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, uuid));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -702,7 +698,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -716,7 +712,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   " . gen_pack_result ($2) . "

@@ -731,7 +727,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, str));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   connv = Field ($3v, 1);

   " . gen_pack_result ($2) . "

@@ -747,7 +743,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, str, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   connv = Field ($3v, 1);

   " . gen_pack_result ($2) . "

@@ -762,7 +758,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1, 0));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   connv = Field ($3v, 1);

   " . gen_pack_result ($2) . "

@@ -777,7 +773,7 @@ sub gen_c_code

   $c_ret_type r;

   NONBLOCKING (r = $c_name ($1));

-  CHECK_ERROR (!r, conn, \"$c_name\");

+  CHECK_ERROR (!r, \"$c_name\");

   connv = Field ($3v, 1);

   " . gen_pack_result ($2) . "

diff --git a/libvirt/libvirt_c.c b/libvirt/libvirt_c.c

index 6e56682..8d51944 100644

--- a/libvirt/libvirt_c.c

+++ b/libvirt/libvirt_c.c

@@ -61,7 +61,7 @@ ocaml_libvirt_connect_close (value connv)

   int r;

   NONBLOCKING (r = virConnectClose (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectClose");

+  CHECK_ERROR (r == -1, "virConnectClose");

   /* So that we don't double-free in the finalizer: */

   Connect_val (connv) = NULL;

@@ -83,7 +83,7 @@ ocaml_libvirt_connect_get_hostname (value connv)

   char *r;

   NONBLOCKING (r = virConnectGetHostname (conn));

-  CHECK_ERROR (!r, conn, "virConnectGetHostname");

+  CHECK_ERROR (!r, "virConnectGetHostname");

   rv = caml_copy_string (r);

   free (r);

@@ -104,7 +104,7 @@ ocaml_libvirt_connect_get_uri (value connv)

   char *r;

   NONBLOCKING (r = virConnectGetURI (conn));

-  CHECK_ERROR (!r, conn, "virConnectGetURI");

+  CHECK_ERROR (!r, "virConnectGetURI");

   rv = caml_copy_string (r);

   free (r);

@@ -125,7 +125,7 @@ ocaml_libvirt_connect_get_type (value connv)

   const char *r;

   NONBLOCKING (r = virConnectGetType (conn));

-  CHECK_ERROR (!r, conn, "virConnectGetType");

+  CHECK_ERROR (!r, "virConnectGetType");

   rv = caml_copy_string (r);

   CAMLreturn (rv);

@@ -144,7 +144,7 @@ ocaml_libvirt_connect_num_of_domains (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfDomains (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfDomains");

+  CHECK_ERROR (r == -1, "virConnectNumOfDomains");

   CAMLreturn (Val_int (r));

 }

@@ -174,7 +174,7 @@ ocaml_libvirt_connect_list_domains (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListDomains (conn, ids, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListDomains");

+  CHECK_ERROR (r == -1, "virConnectListDomains");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i)

@@ -196,7 +196,7 @@ ocaml_libvirt_connect_num_of_defined_domains (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfDefinedDomains (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfDefinedDomains");

+  CHECK_ERROR (r == -1, "virConnectNumOfDefinedDomains");

   CAMLreturn (Val_int (r));

 }

@@ -227,7 +227,7 @@ ocaml_libvirt_connect_list_defined_domains (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListDefinedDomains (conn, names, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListDefinedDomains");

+  CHECK_ERROR (r == -1, "virConnectListDefinedDomains");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -252,7 +252,7 @@ ocaml_libvirt_connect_num_of_networks (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfNetworks (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfNetworks");

+  CHECK_ERROR (r == -1, "virConnectNumOfNetworks");

   CAMLreturn (Val_int (r));

 }

@@ -283,7 +283,7 @@ ocaml_libvirt_connect_list_networks (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListNetworks (conn, names, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListNetworks");

+  CHECK_ERROR (r == -1, "virConnectListNetworks");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -308,7 +308,7 @@ ocaml_libvirt_connect_num_of_defined_networks (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfDefinedNetworks (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfDefinedNetworks");

+  CHECK_ERROR (r == -1, "virConnectNumOfDefinedNetworks");

   CAMLreturn (Val_int (r));

 }

@@ -339,7 +339,7 @@ ocaml_libvirt_connect_list_defined_networks (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListDefinedNetworks (conn, names, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListDefinedNetworks");

+  CHECK_ERROR (r == -1, "virConnectListDefinedNetworks");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -364,7 +364,7 @@ ocaml_libvirt_connect_num_of_storage_pools (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfStoragePools (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfStoragePools");

+  CHECK_ERROR (r == -1, "virConnectNumOfStoragePools");

   CAMLreturn (Val_int (r));

 }

@@ -395,7 +395,7 @@ ocaml_libvirt_connect_list_storage_pools (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListStoragePools (conn, names, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListStoragePools");

+  CHECK_ERROR (r == -1, "virConnectListStoragePools");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -420,7 +420,7 @@ ocaml_libvirt_connect_num_of_defined_storage_pools (value connv)

   int r;

   NONBLOCKING (r = virConnectNumOfDefinedStoragePools (conn));

-  CHECK_ERROR (r == -1, conn, "virConnectNumOfDefinedStoragePools");

+  CHECK_ERROR (r == -1, "virConnectNumOfDefinedStoragePools");

   CAMLreturn (Val_int (r));

 }

@@ -451,7 +451,7 @@ ocaml_libvirt_connect_list_defined_storage_pools (value connv, value iv)

   }

   NONBLOCKING (r = virConnectListDefinedStoragePools (conn, names, i));

-  CHECK_ERROR (r == -1, conn, "virConnectListDefinedStoragePools");

+  CHECK_ERROR (r == -1, "virConnectListDefinedStoragePools");

   rv = caml_alloc (r, 0);

   for (i = 0; i < r; ++i) {

@@ -477,7 +477,7 @@ ocaml_libvirt_connect_get_capabilities (value connv)

   char *r;

   NONBLOCKING (r = virConnectGetCapabilities (conn));

-  CHECK_ERROR (!r, conn, "virConnectGetCapabilities");

+  CHECK_ERROR (!r, "virConnectGetCapabilities");

   rv = caml_copy_string (r);

   free (r);

@@ -498,7 +498,7 @@ ocaml_libvirt_connect_domain_event_deregister_any (value connv, value iv)

   int r;

   NONBLOCKING (r = virConnectDomainEventDeregisterAny (conn, i));

-  CHECK_ERROR (r == -1, conn, "virConnectDomainEventDeregisterAny");

+  CHECK_ERROR (r == -1, "virConnectDomainEventDeregisterAny");

   CAMLreturn (Val_unit);

 }

@@ -518,7 +518,7 @@ ocaml_libvirt_domain_create_linux (value connv, value strv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainCreateLinux (conn, str, 0));

-  CHECK_ERROR (!r, conn, "virDomainCreateLinux");

+  CHECK_ERROR (!r, "virDomainCreateLinux");

   rv = Val_domain (r, connv);

@@ -541,7 +541,7 @@ ocaml_libvirt_domain_create_xml (value connv, value strv, value uv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainCreateXML (conn, str, u));

-  CHECK_ERROR (!r, conn, "virDomainCreateXML");

+  CHECK_ERROR (!r, "virDomainCreateXML");

   rv = Val_domain (r, connv);

@@ -558,11 +558,10 @@ ocaml_libvirt_domain_free (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainFree (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainFree");

+  CHECK_ERROR (r == -1, "virDomainFree");

   /* So that we don't double-free in the finalizer: */

   Domain_val (domv) = NULL;

@@ -580,11 +579,10 @@ ocaml_libvirt_domain_destroy (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainDestroy (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainDestroy");

+  CHECK_ERROR (r == -1, "virDomainDestroy");

   /* So that we don't double-free in the finalizer: */

   Domain_val (domv) = NULL;

@@ -607,7 +605,7 @@ ocaml_libvirt_domain_lookup_by_name (value connv, value strv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainLookupByName (conn, str));

-  CHECK_ERROR (!r, conn, "virDomainLookupByName");

+  CHECK_ERROR (!r, "virDomainLookupByName");

   rv = Val_domain (r, connv);

@@ -629,7 +627,7 @@ ocaml_libvirt_domain_lookup_by_id (value connv, value iv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainLookupByID (conn, i));

-  CHECK_ERROR (!r, conn, "virDomainLookupByID");

+  CHECK_ERROR (!r, "virDomainLookupByID");

   rv = Val_domain (r, connv);

@@ -651,7 +649,7 @@ ocaml_libvirt_domain_lookup_by_uuid (value connv, value uuidv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainLookupByUUID (conn, uuid));

-  CHECK_ERROR (!r, conn, "virDomainLookupByUUID");

+  CHECK_ERROR (!r, "virDomainLookupByUUID");

   rv = Val_domain (r, connv);

@@ -673,7 +671,7 @@ ocaml_libvirt_domain_lookup_by_uuid_string (value connv, value strv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainLookupByUUIDString (conn, str));

-  CHECK_ERROR (!r, conn, "virDomainLookupByUUIDString");

+  CHECK_ERROR (!r, "virDomainLookupByUUIDString");

   rv = Val_domain (r, connv);

@@ -691,11 +689,10 @@ ocaml_libvirt_domain_get_name (value domv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   const char *r;

   NONBLOCKING (r = virDomainGetName (dom));

-  CHECK_ERROR (!r, conn, "virDomainGetName");

+  CHECK_ERROR (!r, "virDomainGetName");

   rv = caml_copy_string (r);

   CAMLreturn (rv);

@@ -712,11 +709,10 @@ ocaml_libvirt_domain_get_os_type (value domv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   char *r;

   NONBLOCKING (r = virDomainGetOSType (dom));

-  CHECK_ERROR (!r, conn, "virDomainGetOSType");

+  CHECK_ERROR (!r, "virDomainGetOSType");

   rv = caml_copy_string (r);

   free (r);

@@ -734,11 +730,10 @@ ocaml_libvirt_domain_get_xml_desc (value domv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   char *r;

   NONBLOCKING (r = virDomainGetXMLDesc (dom, 0));

-  CHECK_ERROR (!r, conn, "virDomainGetXMLDesc");

+  CHECK_ERROR (!r, "virDomainGetXMLDesc");

   rv = caml_copy_string (r);

   free (r);

@@ -756,12 +751,11 @@ ocaml_libvirt_domain_get_uuid (value domv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   unsigned char uuid[VIR_UUID_BUFLEN];

   int r;

   NONBLOCKING (r = virDomainGetUUID (dom, uuid));

-  CHECK_ERROR (r == -1, conn, "virDomainGetUUID");

+  CHECK_ERROR (r == -1, "virDomainGetUUID");

   /* UUIDs are byte arrays with a fixed length. */

   rv = caml_alloc_string (VIR_UUID_BUFLEN);

@@ -780,12 +774,11 @@ ocaml_libvirt_domain_get_uuid_string (value domv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   char uuid[VIR_UUID_STRING_BUFLEN];

   int r;

   NONBLOCKING (r = virDomainGetUUIDString (dom, uuid));

-  CHECK_ERROR (r == -1, conn, "virDomainGetUUIDString");

+  CHECK_ERROR (r == -1, "virDomainGetUUIDString");

   rv = caml_copy_string (uuid);

   CAMLreturn (rv);

@@ -801,11 +794,10 @@ ocaml_libvirt_domain_get_max_vcpus (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainGetMaxVcpus (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainGetMaxVcpus");

+  CHECK_ERROR (r == -1, "virDomainGetMaxVcpus");

   CAMLreturn (Val_int (r));

 }

@@ -820,12 +812,11 @@ ocaml_libvirt_domain_save (value domv, value strv)

   CAMLparam2 (domv, strv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   char *str = String_val (strv);

   int r;

   NONBLOCKING (r = virDomainSave (dom, str));

-  CHECK_ERROR (r == -1, conn, "virDomainSave");

+  CHECK_ERROR (r == -1, "virDomainSave");

   CAMLreturn (Val_unit);

 }

@@ -844,7 +835,7 @@ ocaml_libvirt_domain_restore (value connv, value strv)

   int r;

   NONBLOCKING (r = virDomainRestore (conn, str));

-  CHECK_ERROR (r == -1, conn, "virDomainRestore");

+  CHECK_ERROR (r == -1, "virDomainRestore");

   CAMLreturn (Val_unit);

 }

@@ -860,12 +851,11 @@ ocaml_libvirt_domain_core_dump (value domv, value strv)

   CAMLlocal1 (rv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   char *str = String_val (strv);

   int r;

   NONBLOCKING (r = virDomainCoreDump (dom, str, 0));

-  CHECK_ERROR (!r, conn, "virDomainCoreDump");

+  CHECK_ERROR (!r, "virDomainCoreDump");

   CAMLreturn (Val_unit);

 }

@@ -880,11 +870,10 @@ ocaml_libvirt_domain_suspend (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainSuspend (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainSuspend");

+  CHECK_ERROR (r == -1, "virDomainSuspend");

   CAMLreturn (Val_unit);

 }

@@ -899,11 +888,10 @@ ocaml_libvirt_domain_resume (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainResume (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainResume");

+  CHECK_ERROR (r == -1, "virDomainResume");

   CAMLreturn (Val_unit);

 }

@@ -918,11 +906,10 @@ ocaml_libvirt_domain_shutdown (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainShutdown (dom));

-  CHECK_ERROR (r == -1, conn, "virDomainShutdown");

+  CHECK_ERROR (r == -1, "virDomainShutdown");

   CAMLreturn (Val_unit);

 }

@@ -937,11 +924,10 @@ ocaml_libvirt_domain_reboot (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;

   NONBLOCKING (r = virDomainReboot (dom, 0));

-  CHECK_ERROR (r == -1, conn, "virDomainReboot");

+  CHECK_ERROR (r == -1, "virDomainReboot");

   CAMLreturn (Val_unit);

 }

@@ -961,7 +947,7 @@ ocaml_libvirt_domain_define_xml (value connv, value strv)

   virDomainPtr r;

   NONBLOCKING (r = virDomainDefineXML (conn, str));

-  CHECK_ERROR (!r, conn, "virDomainDefineXML");

+  CHECK_ERROR (!r, "virDomainDefineXML");

   rv = Val_domain (r, connv);

@@ -978,11 +964,10 @@ ocaml_libvirt_domain_undefine (value domv)

   CAMLparam1 (domv);

   virDomainPtr dom = Domain_val (domv);

-  virConnectPtr conn = Connect_domv (domv);

   int r;