X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Flibvirt_c_oneoffs.c;h=0d568d6e0c0b1776796e1df414c49d408b04c4b2;hb=7a65ae1678144521b42be8856c615cf780a3f85c;hp=a9ed5b7d2d1b14eced74507ae848446b9873a21e;hpb=aee5f1b6aa2b80873a34de67727c40ad43cccca7;p=virt-top.git

diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c
index a9ed5b7..0d568d6 100644
--- a/libvirt/libvirt_c_oneoffs.c
+++ b/libvirt/libvirt_c_oneoffs.c
@@ -127,22 +127,6 @@ ocaml_libvirt_connect_open_readonly (value namev, value unit)
 }
 
 CAMLprim value
-ocaml_libvirt_connect_close (value connv)
-{
-  CAMLparam1 (connv);
-  virConnectPtr conn = Connect_val (connv);
-  int r;
-
-  NONBLOCKING (r = virConnectClose (conn));
-  CHECK_ERROR (r == -1, conn, "virConnectClose");
-
-  /* So that we don't double-free in the finalizer: */
-  Connect_val (connv) = NULL;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
 ocaml_libvirt_connect_get_version (value connv)
 {
   CAMLparam1 (connv);
@@ -293,40 +277,6 @@ ocaml_libvirt_domain_lookup_by_uuid (value connv, value uuidv)
 }
 
 CAMLprim value
-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");
-
-  /* So that we don't double-free in the finalizer: */
-  Domain_val (domv) = NULL;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-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");
-
-  /* So that we don't double-free in the finalizer: */
-  Domain_val (domv) = NULL;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
 ocaml_libvirt_domain_save (value domv, value pathv)
 {
   CAMLparam2 (domv, pathv);
@@ -371,40 +321,6 @@ ocaml_libvirt_domain_core_dump (value domv, value pathv)
 }
 
 CAMLprim value
-ocaml_libvirt_domain_get_uuid (value domv)
-{
-  CAMLparam1 (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");
-
-  rv = caml_copy_string ((char *) uuid);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_get_uuid_string (value domv)
-{
-  CAMLparam1 (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");
-
-  rv = caml_copy_string (uuid);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
 ocaml_libvirt_domain_get_id (value domv)
 {
   CAMLparam1 (domv);
@@ -648,34 +564,6 @@ ocaml_libvirt_domain_define_xml (value connv, value xmlv)
 }
 
 CAMLprim value
-ocaml_libvirt_domain_get_autostart (value domv)
-{
-  CAMLparam1 (domv);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  int r, autostart;
-
-  NONBLOCKING (r = virDomainGetAutostart (dom, &autostart));
-  CHECK_ERROR (r == -1, conn, "virDomainGetAutostart");
-
-  CAMLreturn (autostart ? Val_true : Val_false);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_set_autostart (value domv, value autostartv)
-{
-  CAMLparam2 (domv, autostartv);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  int r, autostart = autostartv == Val_true ? 1 : 0;
-
-  NONBLOCKING (r = virDomainSetAutostart (dom, autostart));
-  CHECK_ERROR (r == -1, conn, "virDomainSetAutostart");
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
 ocaml_libvirt_domain_set_vcpus (value domv, value nvcpusv)
 {
   CAMLparam2 (domv, nvcpusv);
@@ -951,102 +839,6 @@ ocaml_libvirt_network_define_xml (value connv, value xmlv)
   CAMLreturn (rv);
 }
 
-CAMLprim value
-ocaml_libvirt_network_destroy (value netv)
-{
-  CAMLparam1 (netv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  int r;
-
-  NONBLOCKING (r = virNetworkDestroy (net));
-  CHECK_ERROR (r == -1, conn, "virNetworkDestroy");
-
-  /* So that we don't double-free in the finalizer: */
-  Network_val (netv) = NULL;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-ocaml_libvirt_network_free (value netv)
-{
-  CAMLparam1 (netv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  int r;
-
-  NONBLOCKING (r = virNetworkFree (net));
-  CHECK_ERROR (r == -1, conn, "virNetworkFree");
-
-  /* So that we don't double-free in the finalizer: */
-  Network_val (netv) = NULL;
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-ocaml_libvirt_network_get_uuid (value netv)
-{
-  CAMLparam1 (netv);
-  CAMLlocal1 (rv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  unsigned char uuid[VIR_UUID_BUFLEN];
-  int r;
-
-  NONBLOCKING (r = virNetworkGetUUID (net, uuid));
-  CHECK_ERROR (r == -1, conn, "virNetworkGetUUID");
-
-  rv = caml_copy_string ((char *) uuid);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_get_uuid_string (value netv)
-{
-  CAMLparam1 (netv);
-  CAMLlocal1 (rv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  char uuid[VIR_UUID_STRING_BUFLEN];
-  int r;
-
-  NONBLOCKING (r = virNetworkGetUUIDString (net, uuid));
-  CHECK_ERROR (r == -1, conn, "virNetworkGetUUIDString");
-
-  rv = caml_copy_string (uuid);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_get_autostart (value netv)
-{
-  CAMLparam1 (netv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  int r, autostart;
-
-  NONBLOCKING (r = virNetworkGetAutostart (net, &autostart));
-  CHECK_ERROR (r == -1, conn, "virNetworkGetAutostart");
-
-  CAMLreturn (autostart ? Val_true : Val_false);
-}
-
-CAMLprim value
-ocaml_libvirt_network_set_autostart (value netv, value autostartv)
-{
-  CAMLparam2 (netv, autostartv);
-  virNetworkPtr net = Network_val (netv);
-  virConnectPtr conn = Connect_netv (netv);
-  int r, autostart = autostartv == Val_true ? 1 : 0;
-
-  NONBLOCKING (r = virNetworkSetAutostart (net, autostart));
-  CHECK_ERROR (r == -1, conn, "virNetworkSetAutostart");
-
-  CAMLreturn (Val_unit);
-}
-
 /*----------------------------------------------------------------------*/
 
 CAMLprim value