X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Flibvirt_c_oneoffs.c;h=b1331e0062cd25b47c9f29b835f988e805600861;hb=4bcef5db5222f7a2596aaa1d8664fbcfd7185076;hp=6387b523a19412ad1a3865709687e82f887beba2;hpb=43b894e0ef93f380dcd8b1b20a3cd6626a8f3b7d;p=virt-top.git

diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c
index 6387b52..b1331e0 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);
@@ -245,198 +229,6 @@ ocaml_libvirt_connect_node_get_cells_free_memory (value connv,
 }
 
 CAMLprim value
-ocaml_libvirt_domain_create_linux (value connv, value xmlv)
-{
-  CAMLparam2 (connv, xmlv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *xml = String_val (xmlv);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainCreateLinux (conn, xml, 0));
-  CHECK_ERROR (!r, conn, "virDomainCreateLinux");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_lookup_by_id (value connv, value iv)
-{
-  CAMLparam2 (connv, iv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  int i = Int_val (iv);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainLookupByID (conn, i));
-  CHECK_ERROR (!r, conn, "virDomainLookupByID");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_lookup_by_uuid (value connv, value uuidv)
-{
-  CAMLparam2 (connv, uuidv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *uuid = String_val (uuidv);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainLookupByUUID (conn, (unsigned char *) uuid));
-  CHECK_ERROR (!r, conn, "virDomainLookupByUUID");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_lookup_by_uuid_string (value connv, value uuidv)
-{
-  CAMLparam2 (connv, uuidv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *uuid = String_val (uuidv);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainLookupByUUIDString (conn, uuid));
-  CHECK_ERROR (!r, conn, "virDomainLookupByUUIDString");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_lookup_by_name (value connv, value namev)
-{
-  CAMLparam2 (connv, namev);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *name = String_val (namev);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainLookupByName (conn, name));
-  CHECK_ERROR (!r, conn, "virDomainLookupByName");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-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);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  char *path = String_val (pathv);
-  int r;
-
-  NONBLOCKING (r = virDomainSave (dom, path));
-  CHECK_ERROR (r == -1, conn, "virDomainSave");
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_restore (value connv, value pathv)
-{
-  CAMLparam2 (connv, pathv);
-  virConnectPtr conn = Connect_val (connv);
-  char *path = String_val (pathv);
-  int r;
-
-  NONBLOCKING (r = virDomainRestore (conn, path));
-  CHECK_ERROR (r == -1, conn, "virDomainRestore");
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_core_dump (value domv, value pathv)
-{
-  CAMLparam2 (domv, pathv);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  char *path = String_val (pathv);
-  int r;
-
-  NONBLOCKING (r = virDomainCoreDump (dom, path, 0));
-  CHECK_ERROR (r == -1, conn, "virDomainCoreDump");
-
-  CAMLreturn (Val_unit);
-}
-
-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);
@@ -664,50 +456,6 @@ ocaml_libvirt_domain_set_scheduler_parameters (value domv, value paramsv)
 }
 
 CAMLprim value
-ocaml_libvirt_domain_define_xml (value connv, value xmlv)
-{
-  CAMLparam2 (connv, xmlv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *xml = String_val (xmlv);
-  virDomainPtr r;
-
-  NONBLOCKING (r = virDomainDefineXML (conn, xml));
-  CHECK_ERROR (!r, conn, "virDomainDefineXML");
-
-  rv = Val_domain (r, connv);
-  CAMLreturn (rv);
-}
-
-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);
@@ -781,50 +529,6 @@ ocaml_libvirt_domain_get_vcpus (value domv, value maxinfov, value maplenv)
 }
 
 CAMLprim value
-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");
-
-  CAMLreturn (Val_int (r));
-}
-
-CAMLprim value
-ocaml_libvirt_domain_attach_device (value domv, value xmlv)
-{
-  CAMLparam2 (domv, xmlv);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  char *xml = String_val (xmlv);
-  int r;
-
-  NONBLOCKING (r = virDomainAttachDevice (dom, xml));
-  CHECK_ERROR (r == -1, conn, "virDomainAttachDevice");
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
-ocaml_libvirt_domain_detach_device (value domv, value xmlv)
-{
-  CAMLparam2 (domv, xmlv);
-  virDomainPtr dom = Domain_val (domv);
-  virConnectPtr conn = Connect_domv (domv);
-  char *xml = String_val (xmlv);
-  int r;
-
-  NONBLOCKING (r = virDomainDetachDevice (dom, xml));
-  CHECK_ERROR (r == -1, conn, "virDomainDetachDevice");
-
-  CAMLreturn (Val_unit);
-}
-
-CAMLprim value
 ocaml_libvirt_domain_migrate_native (value domv, value dconnv, value flagsv, value optdnamev, value opturiv, value optbandwidthv, value unitv)
 {
 #ifdef HAVE_VIRDOMAINMIGRATE
@@ -935,182 +639,6 @@ ocaml_libvirt_domain_interface_stats (value domv, value pathv)
 #endif
 }
 
-CAMLprim value
-ocaml_libvirt_network_lookup_by_name (value connv, value namev)
-{
-  CAMLparam2 (connv, namev);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *name = String_val (namev);
-  virNetworkPtr r;
-
-  NONBLOCKING (r = virNetworkLookupByName (conn, name));
-  CHECK_ERROR (!r, conn, "virNetworkLookupByName");
-
-  rv = Val_network (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_lookup_by_uuid (value connv, value uuidv)
-{
-  CAMLparam2 (connv, uuidv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *uuid = String_val (uuidv);
-  virNetworkPtr r;
-
-  NONBLOCKING (r = virNetworkLookupByUUID (conn, (unsigned char *) uuid));
-  CHECK_ERROR (!r, conn, "virNetworkLookupByUUID");
-
-  rv = Val_network (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_lookup_by_uuid_string (value connv, value uuidv)
-{
-  CAMLparam2 (connv, uuidv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *uuid = String_val (uuidv);
-  virNetworkPtr r;
-
-  NONBLOCKING (r = virNetworkLookupByUUIDString (conn, uuid));
-  CHECK_ERROR (!r, conn, "virNetworkLookupByUUIDString");
-
-  rv = Val_network (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_create_xml (value connv, value xmlv)
-{
-  CAMLparam2 (connv, xmlv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *xml = String_val (xmlv);
-  virNetworkPtr r;
-
-  NONBLOCKING (r = virNetworkCreateXML (conn, xml));
-  CHECK_ERROR (!r, conn, "virNetworkCreateXML");
-
-  rv = Val_network (r, connv);
-  CAMLreturn (rv);
-}
-
-CAMLprim value
-ocaml_libvirt_network_define_xml (value connv, value xmlv)
-{
-  CAMLparam2 (connv, xmlv);
-  CAMLlocal1 (rv);
-  virConnectPtr conn = Connect_val (connv);
-  char *xml = String_val (xmlv);
-  virNetworkPtr r;
-
-  NONBLOCKING (r = virNetworkDefineXML (conn, xml));
-  CHECK_ERROR (!r, conn, "virNetworkDefineXML");
-
-  rv = Val_network (r, connv);
-  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