ruby-libvirt 0.2.0 → 0.3.0

data/ext/libvirt/network.h

@@ -1,6 +1,7 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
+VALUE network_new(virNetworkPtr n, VALUE conn);
 void init_network();
 
 #endif

data/ext/libvirt/nodedevice.c

@@ -25,6 +25,7 @@
 #include "connect.h"
 #include "extconf.h"
 
+#if HAVE_TYPE_VIRNODEDEVICEPTR
 static VALUE c_nodedevice;
 
 static void nodedevice_free(void *s) {
@@ -35,123 +36,16 @@ static virNodeDevicePtr nodedevice_get(VALUE s) {
     generic_get(NodeDevice, s);
 }
 
-static VALUE nodedevice_new(virNodeDevicePtr s, VALUE conn) {
+VALUE nodedevice_new(virNodeDevicePtr s, VALUE conn) {
     return generic_new(c_nodedevice, s, conn, nodedevice_free);
 }
 
-/*
- * call-seq:
- *   conn.num_of_nodedevices -> fixnum
- *
- * Call +virNodeNumOfDevices+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeNumOfDevices]
- */
-static VALUE libvirt_conn_num_of_nodedevices(int argc, VALUE *argv, VALUE c) {
-    int result;
-    virConnectPtr conn = connect_get(c);
-    VALUE cap, flags;
-
-    rb_scan_args(argc, argv, "02", &cap, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    result = virNodeNumOfDevices(conn, get_string_or_nil(cap), NUM2UINT(flags));
-    _E(result < 0, create_error(e_RetrieveError, "virNodeNumOfDevices", "",
-                                conn));
-
-    return INT2NUM(result);
-}
-
-/*
- * call-seq:
- *   conn.list_nodedevices -> list
- *
- * Call +virNodeListDevices+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeListDevices]
- */
-static VALUE libvirt_conn_list_nodedevices(int argc, VALUE *argv, VALUE c) {
-    int i, r, num;
-    virConnectPtr conn = connect_get(c);
-    VALUE cap, flags;
-    char *capstr;
-    VALUE result;
-    char **names;
-
-    rb_scan_args(argc, argv, "02", &cap, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    capstr = get_string_or_nil(cap);
-
-    num = virNodeNumOfDevices(conn, capstr, 0);
-    _E(num < 0, create_error(e_RetrieveError, "virNodeNumOfDevices", "", conn));
-    if (num == 0) {
-        /* if num is 0, don't call virNodeListDevices function */
-        result = rb_ary_new2(num);
-        return result;
-    }
-    names = ALLOC_N(char *, num);
-    r = virNodeListDevices(conn, capstr, names, num, NUM2UINT(flags));
-    if (r < 0) {
-        free(names);
-        _E(r < 0, create_error(e_RetrieveError, "virNodeListDevices", "", conn));
-    }
-
-    result = rb_ary_new2(num);
-    for (i=0; i<num; i++) {
-        rb_ary_push(result, rb_str_new2(names[i]));
-        free(names[i]);
-    }
-    free(names);
-    return result;
-}
-
-/*
- * call-seq:
- *   conn.lookup_nodedevice_by_name -> Libvirt::NodeDevice
- *
- * Call +virNodeDeviceLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceLookupByName]
- */
-static VALUE libvirt_conn_lookup_nodedevice_by_name(VALUE c, VALUE name) {
-    virNodeDevicePtr nodedev;
-    virConnectPtr conn = connect_get(c);
-
-    nodedev = virNodeDeviceLookupByName(conn, StringValueCStr(name));
-    _E(nodedev == NULL, create_error(e_RetrieveError, "virNodeDeviceLookupByName", "", conn));
-
-    return nodedevice_new(nodedev, c);
-
-}
-
-#if HAVE_VIRNODEDEVICECREATEXML
-/*
- * call-seq:
- *   conn.create_nodedevice_xml -> Libvirt::NodeDevice
- *
- * Call +virNodeDeviceCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceCreateXML]
- */
-static VALUE libvirt_conn_create_nodedevice_xml(int argc, VALUE *argv, VALUE c) {
-    virNodeDevicePtr nodedev;
-    virConnectPtr conn = connect_get(c);
-    VALUE xml, flags;
-
-    rb_scan_args(argc, argv, "11", &xml, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    nodedev = virNodeDeviceCreateXML(conn, StringValueCStr(xml), NUM2UINT(flags));
-    _E(nodedev == NULL, create_error(e_Error, "virNodeDeviceCreateXML", "", conn));
-
-    return nodedevice_new(nodedev, c);
-}
-#endif
-
 /*
  * call-seq:
  *   nodedevice.name -> string
  *
  * Call +virNodeDeviceGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetName]
+ * to retrieve the name of the node device.
  */
 static VALUE libvirt_nodedevice_name(VALUE c) {
     gen_call_string(virNodeDeviceGetName, conn(c), 0, nodedevice_get(c));
@@ -162,6 +56,7 @@ static VALUE libvirt_nodedevice_name(VALUE c) {
  *   nodedevice.parent -> string
  *
  * Call +virNodeDeviceGetParent+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetParent]
+ * to retrieve the parent of the node device.
  */
 static VALUE libvirt_nodedevice_parent(VALUE c) {
     /* unfortunately we can't use gen_call_string() here because
@@ -183,14 +78,10 @@ static VALUE libvirt_nodedevice_parent(VALUE c) {
  *   nodedevice.num_of_caps -> fixnum
  *
  * Call +virNodeDeviceNumOfCaps+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceNumOfCaps]
+ * to retrieve the number of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_num_of_caps(VALUE c) {
-    int result;
-
-    result = virNodeDeviceNumOfCaps(nodedevice_get(c));
-    _E(result < 0, create_error(e_RetrieveError, "virNodeNumOfDevices", "", connect_get(c)));
-
-    return INT2NUM(result);
+    gen_call_int(virNodeDeviceNumOfCaps, conn(c), nodedevice_get(c));
 }
 
 /*
@@ -198,42 +89,37 @@ static VALUE libvirt_nodedevice_num_of_caps(VALUE c) {
  *   nodedevice.list_caps -> list
  *
  * Call +virNodeDeviceListCaps+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceListCaps]
+ * to retrieve a list of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_list_caps(VALUE c) {
-    int i, r, num;
+    int r, num;
     virConnectPtr conn = connect_get(c);
     virNodeDevicePtr nodedev = nodedevice_get(c);
-    VALUE result;
     char **names;
 
     num = virNodeDeviceNumOfCaps(nodedev);
-    _E(num < 0, create_error(e_RetrieveError, "virNodeDeviceNumOfCaps", "", conn));
-    if (num == 0) {
+    _E(num < 0, create_error(e_RetrieveError, "virNodeDeviceNumOfCaps", conn));
+    if (num == 0)
         /* if num is 0, don't call virNodeDeviceListCaps function */
-        result = rb_ary_new2(num);
-        return result;
-    }
+        return rb_ary_new2(num);
+
     names = ALLOC_N(char *, num);
     r = virNodeDeviceListCaps(nodedev, names, num);
     if (r < 0) {
-        free(names);
-        _E(r < 0, create_error(e_RetrieveError, "virNodeDeviceListCaps", "", conn));
+        xfree(names);
+        rb_exc_raise(create_error(e_RetrieveError, "virNodeDeviceListCaps",
+                                  conn));
     }
 
-    result = rb_ary_new2(num);
-    for (i=0; i<num; i++) {
-        rb_ary_push(result, rb_str_new2(names[i]));
-        free(names[i]);
-    }
-    free(names);
-    return result;
+    return gen_list(num, &names);
 }
 
 /*
  * call-seq:
- *   nodedevice.xml_desc -> string
+ *   nodedevice.xml_desc(flags=0) -> string
  *
  * Call +virNodeDeviceGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetXMLDesc]
+ * to retrieve the XML for the node device.
  */
 static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -252,6 +138,7 @@ static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE s) {
  *   nodedevice.detach -> nil
  *
  * Call +virNodeDeviceDettach+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDettach]
+ * to detach the node device from the node.
  */
 static VALUE libvirt_nodedevice_detach(VALUE s) {
     gen_call_void(virNodeDeviceDettach, conn(s), nodedevice_get(s));
@@ -262,6 +149,7 @@ static VALUE libvirt_nodedevice_detach(VALUE s) {
  *   nodedevice.reattach -> nil
  *
  * Call +virNodeDeviceReAttach+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReAttach]
+ * to reattach the node device to the node.
  */
 static VALUE libvirt_nodedevice_reattach(VALUE s) {
     gen_call_void(virNodeDeviceReAttach, conn(s), nodedevice_get(s));
@@ -272,6 +160,7 @@ static VALUE libvirt_nodedevice_reattach(VALUE s) {
  *   nodedevice.reset -> nil
  *
  * Call +virNodeDeviceReset+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReset]
+ * to reset the node device.
  */
 static VALUE libvirt_nodedevice_reset(VALUE s) {
     gen_call_void(virNodeDeviceReset, conn(s), nodedevice_get(s));
@@ -283,6 +172,7 @@ static VALUE libvirt_nodedevice_reset(VALUE s) {
  *   nodedevice.destroy -> nil
  *
  * Call +virNodeDeviceDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDestroy]
+ * to shutdown the node device.
  */
 static VALUE libvirt_nodedevice_destroy(VALUE s) {
     gen_call_void(virNodeDeviceDestroy, conn(s), nodedevice_get(s));
@@ -294,27 +184,21 @@ static VALUE libvirt_nodedevice_destroy(VALUE s) {
  *   nodedevice.free -> nil
  *
  * Call +virNodeDeviceFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceFree]
+ * to free the node device object.  After this call the node device object is
+ * no longer valid.
  */
 static VALUE libvirt_nodedevice_free(VALUE s) {
     gen_call_free(NodeDevice, s);
 }
+#endif
 
 /*
  * Class Libvirt::NodeDevice
  */
 void init_nodedevice()
 {
+#if HAVE_TYPE_VIRNODEDEVICEPTR
     c_nodedevice = rb_define_class_under(m_libvirt, "NodeDevice", rb_cObject);
-    rb_define_method(c_connect, "num_of_nodedevices",
-                     libvirt_conn_num_of_nodedevices, -1);
-    rb_define_method(c_connect, "list_nodedevices",
-                     libvirt_conn_list_nodedevices, -1);
-    rb_define_method(c_connect, "lookup_nodedevice_by_name",
-                     libvirt_conn_lookup_nodedevice_by_name, 1);
-#if HAVE_VIRNODEDEVICECREATEXML
-    rb_define_method(c_connect, "create_nodedevice_xml",
-                     libvirt_conn_create_nodedevice_xml, -1);
-#endif
 
     rb_define_method(c_nodedevice, "name", libvirt_nodedevice_name, 0);
     rb_define_method(c_nodedevice, "parent", libvirt_nodedevice_parent, 0);
@@ -330,4 +214,5 @@ void init_nodedevice()
     rb_define_method(c_nodedevice, "destroy", libvirt_nodedevice_destroy, 0);
 #endif
     rb_define_method(c_nodedevice, "free", libvirt_nodedevice_free, 0);
+#endif
 }

data/ext/libvirt/nwfilter.c

@@ -36,83 +36,16 @@ static virNWFilterPtr nwfilter_get(VALUE nw) {
     generic_get(NWFilter, nw);
 }
 
-static VALUE nwfilter_new(virNWFilterPtr nw, VALUE conn) {
+VALUE nwfilter_new(virNWFilterPtr nw, VALUE conn) {
     return generic_new(c_nwfilter, nw, conn, nwfilter_free);
 }
 
-/*
- * call-seq:
- *   conn.num_of_nwfilters -> fixnum
- *
- * Call +virConnectNumOfNWFilters+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfNWFilters]
- */
-static VALUE libvirt_conn_num_of_nwfilters(VALUE s) {
-    gen_conn_num_of(s, NWFilters);
-}
-
-/*
- * call-seq:
- *   conn.list_nwfilters -> list
- *
- * Call +virConnectListNWFilters+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListNWFilters]
- */
-static VALUE libvirt_conn_list_nwfilters(VALUE s) {
-    gen_conn_list_names(s, NWFilters);
-}
-
-/*
- * call-seq:
- *   conn.lookup_nwfilter_by_name -> Libvirt::NWFilter
- *
- * Call +virNWFilterLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterLookupByName]
- */
-static VALUE libvirt_conn_lookup_nwfilter_by_name(VALUE c, VALUE name) {
-    virNWFilterPtr nwfilter;
-    virConnectPtr conn = connect_get(c);
-
-    nwfilter = virNWFilterLookupByName(conn, StringValueCStr(name));
-    _E(nwfilter == NULL, create_error(e_RetrieveError, "virNWFilterLookupByName", "", conn));
-
-    return nwfilter_new(nwfilter, c);
-}
-
-/*
- * call-seq:
- *   conn.lookup_nwfilter_by_uuid -> Libvirt::NWFilter
- *
- * Call +virNWFilterLookupByUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterLookupByUUIDString]
- */
-static VALUE libvirt_conn_lookup_nwfilter_by_uuid(VALUE c, VALUE uuid) {
-    virNWFilterPtr nwfilter;
-    virConnectPtr conn = connect_get(c);
-
-    nwfilter = virNWFilterLookupByUUIDString(conn, StringValueCStr(uuid));
-    _E(nwfilter == NULL, create_error(e_RetrieveError, "virNWFilterLookupByUUIDString", "", conn));
-
-    return nwfilter_new(nwfilter, c);
-}
-
-/*
- * call-seq:
- *   conn.define_nwfilter_xml -> Libvirt::NWFilter
- *
- * Call +virNWFilterDefineXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterDefineXML]
- */
-static VALUE libvirt_conn_define_nwfilter_xml(VALUE c, VALUE xml) {
-    virNWFilterPtr nwfilter;
-    virConnectPtr conn = connect_get(c);
-
-    nwfilter = virNWFilterDefineXML(conn, StringValueCStr(xml));
-    _E(nwfilter == NULL, create_error(e_DefinitionError, "virNWFilterDefineXML", "", conn));
-
-    return nwfilter_new(nwfilter, c);
-}
-
 /*
  * call-seq:
  *   nwfilter.undefine -> nil
  *
  * Call +virNWFilterUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterUndefine]
+ * to undefine the network filter.
  */
 static VALUE libvirt_nwfilter_undefine(VALUE s) {
     gen_call_void(virNWFilterUndefine, conn(s), nwfilter_get(s));
@@ -123,6 +56,7 @@ static VALUE libvirt_nwfilter_undefine(VALUE s) {
  *   nwfilter.name -> string
  *
  * Call +virNWFilterGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetName]
+ * to retrieve the network filter name.
  */
 static VALUE libvirt_nwfilter_name(VALUE s) {
     gen_call_string(virNWFilterGetName, conn(s), 0, nwfilter_get(s));
@@ -133,6 +67,7 @@ static VALUE libvirt_nwfilter_name(VALUE s) {
  *   nwfilter.uuid -> string
  *
  * Call +virNWFilterGetUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetUUIDString]
+ * to retrieve the network filter UUID.
  */
 static VALUE libvirt_nwfilter_uuid(VALUE s) {
     virNWFilterPtr nwfilter = nwfilter_get(s);
@@ -140,16 +75,18 @@ static VALUE libvirt_nwfilter_uuid(VALUE s) {
     char uuid[VIR_UUID_STRING_BUFLEN];
 
     r = virNWFilterGetUUIDString(nwfilter, uuid);
-    _E(r < 0, create_error(e_RetrieveError, "virNWFilterGetUUIDString", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virNWFilterGetUUIDString",
+                           conn(s)));
 
     return rb_str_new2((char *)uuid);
 }
 
 /*
  * call-seq:
- *   nwfilter.xml_desc -> string
+ *   nwfilter.xml_desc(flags=0) -> string
  *
  * Call +virNWFilterGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetXMLDesc]
+ * to retrieve the XML for this network filter.
  */
 static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -168,6 +105,8 @@ static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE s) {
  *   nwfilter.free -> nil
  *
  * Call +virNWFilterFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterFree]
+ * to free this network filter.  After this call the network filter object is
+ * no longer valid.
  */
 static VALUE libvirt_nwfilter_free(VALUE s) {
     gen_call_free(NWFilter, s);
@@ -184,18 +123,6 @@ void init_nwfilter()
     c_nwfilter = rb_define_class_under(m_libvirt, "NWFilter", rb_cObject);
     rb_define_attr(c_nwfilter, "connection", 1, 0);
 
-    /* NWFilter lookup/creation methods */
-    rb_define_method(c_connect, "num_of_nwfilters",
-                     libvirt_conn_num_of_nwfilters, 0);
-    rb_define_method(c_connect, "list_nwfilters",
-                     libvirt_conn_list_nwfilters, 0);
-    rb_define_method(c_connect, "lookup_nwfilter_by_name",
-                     libvirt_conn_lookup_nwfilter_by_name, 1);
-    rb_define_method(c_connect, "lookup_nwfilter_by_uuid",
-                     libvirt_conn_lookup_nwfilter_by_uuid, 1);
-    rb_define_method(c_connect, "define_nwfilter_xml",
-                     libvirt_conn_define_nwfilter_xml, 1);
-
     /* NWFilter object methods */
     rb_define_method(c_nwfilter, "undefine", libvirt_nwfilter_undefine, 0);
     rb_define_method(c_nwfilter, "name", libvirt_nwfilter_name, 0);

data/ext/libvirt/secret.c

@@ -36,92 +36,16 @@ static virSecretPtr secret_get(VALUE s) {
     generic_get(Secret, s);
 }
 
-static VALUE secret_new(virSecretPtr s, VALUE conn) {
+VALUE secret_new(virSecretPtr s, VALUE conn) {
     return generic_new(c_secret, s, conn, secret_free);
 }
 
-/*
- * call-seq:
- *   conn.num_of_secrets -> fixnum
- *
- * Call +virConnectNumOfSecrets+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfSecrets]
- */
-static VALUE libvirt_conn_num_of_secrets(VALUE s) {
-    gen_conn_num_of(s, Secrets);
-}
-
-/*
- * call-seq:
- *   conn.list_secrets -> list
- *
- * Call +virConnectListSecrets+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListSecrets]
- */
-static VALUE libvirt_conn_list_secrets(VALUE s) {
-    gen_conn_list_names(s, Secrets);
-}
-
-/*
- * call-seq:
- *   conn.lookup_secret_by_uuid -> Libvirt::Secret
- *
- * Call +virSecretLookupByUUID+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretLookupByUUID]
- */
-static VALUE libvirt_conn_lookup_secret_by_uuid(VALUE c, VALUE uuid) {
-    virSecretPtr secret;
-    virConnectPtr conn = connect_get(c);
-
-    secret = virSecretLookupByUUIDString(conn, StringValueCStr(uuid));
-    _E(secret == NULL, create_error(e_RetrieveError, "virSecretLookupByUUID", "", conn));
-
-    return secret_new(secret, c);
-}
-
-/*
- * call-seq:
- *   conn.lookup_secret_by_usage -> Libvirt::Secret
- *
- * Call +virSecretLookupByUsage+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretLookupByUsage]
- */
-static VALUE libvirt_conn_lookup_secret_by_usage(int argc, VALUE *argv, VALUE c) {
-    virSecretPtr secret;
-    virConnectPtr conn = connect_get(c);
-    VALUE usageType, usageID;
-
-    rb_scan_args(argc, argv, "11", &usageType, &usageID);
-
-    secret = virSecretLookupByUsage(conn, usageType, StringValueCStr(usageID));
-    _E(secret == NULL, create_error(e_RetrieveError, "virSecretLookupByUsage", "", conn));
-
-    return secret_new(secret, c);
-}
-
-/*
- * call-seq:
- *   conn.define_secret_xml -> Libvirt::Secret
- *
- * Call +virSecretDefineXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretDefineXML]
- */
-static VALUE libvirt_conn_define_secret_xml(int argc, VALUE *argv, VALUE c) {
-    virSecretPtr secret;
-    virConnectPtr conn = connect_get(c);
-    VALUE xml, flags;
-
-    rb_scan_args(argc, argv, "11", &xml, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    secret = virSecretDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
-    _E(secret == NULL, create_error(e_DefinitionError, "virSecretDefineXML", "", conn));
-
-    return secret_new(secret, c);
-}
-
 /*
  * call-seq:
  *   secret.uuid -> string
  *
  * Call +virSecretGetUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUUIDString]
+ * to retrieve the UUID for this secret.
  */
 static VALUE libvirt_secret_uuid(VALUE s) {
     virSecretPtr secret = secret_get(s);
@@ -129,7 +53,7 @@ static VALUE libvirt_secret_uuid(VALUE s) {
     char uuid[VIR_UUID_STRING_BUFLEN];
 
     r = virSecretGetUUIDString(secret, uuid);
-    _E(r < 0, create_error(e_RetrieveError, "virSecretGetUUIDString", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virSecretGetUUIDString", conn(s)));
 
     return rb_str_new2((char *)uuid);
 }
@@ -139,15 +63,10 @@ static VALUE libvirt_secret_uuid(VALUE s) {
  *   secret.usagetype -> fixnum
  *
  * Call +virSecretGetUsageType+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageType]
+ * to retrieve the usagetype for this secret.
  */
 static VALUE libvirt_secret_usagetype(VALUE s) {
-    virSecretPtr secret = secret_get(s);
-    int ret;
-
-    ret = virSecretGetUsageType(secret);
-    _E(ret < 0, create_error(e_RetrieveError, "virSecretGetUsageType", "", conn(s)));
-
-    return INT2NUM(ret);
+    gen_call_int(virSecretGetUsageType, conn(s), secret_get(s));
 }
 
 /*
@@ -155,6 +74,7 @@ static VALUE libvirt_secret_usagetype(VALUE s) {
  *   secret.usageid -> string
  *
  * Call +virSecretGetUsageID+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageID]
+ * to retrieve the usageid for this secret.
  */
 static VALUE libvirt_secret_usageid(VALUE s) {
     gen_call_string(virSecretGetUsageID, conn(s), 0, secret_get(s));
@@ -162,9 +82,10 @@ static VALUE libvirt_secret_usageid(VALUE s) {
 
 /*
  * call-seq:
- *   secret.xml_desc -> string
+ *   secret.xml_desc(flags=0) -> string
  *
  * Call +virSecretGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetXMLDesc]
+ * to retrieve the XML for this secret.
  */
 static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -180,15 +101,14 @@ static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s) {
 
 /*
  * call-seq:
- *   secret.set_value -> nil
+ *   secret.set_value(value, flags=0) -> nil
  *
  * Call +virSecretSetValue+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretSetValue]
+ * to set a new value in this secret.
  */
 static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s) {
-    virSecretPtr secret = secret_get(s);
     VALUE flags;
     VALUE value;
-    int r;
 
     rb_scan_args(argc, argv, "11", &value, &flags);
 
@@ -197,36 +117,48 @@ static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s) {
 
     StringValue(value);
 
-    r = virSecretSetValue(secret, (unsigned char *)RSTRING(value)->ptr,
-                          RSTRING(value)->len, NUM2UINT(flags));
-
-    _E(r < 0, create_error(e_RetrieveError, "virSecretSetValue", "", conn(s)));
-
-    return Qnil;
+    gen_call_void(virSecretSetValue, conn(s), secret_get(s),
+                  (unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value),
+                  NUM2UINT(flags));
 }
 
 /*
  * call-seq:
- *   secret.get_value -> string
+ *   secret.get_value(flags=0) -> string
  *
  * Call +virSecretGetValue+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetValue]
+ * to retrieve the value from this secret.
  */
 static VALUE libvirt_secret_get_value(int argc, VALUE *argv, VALUE s) {
     virSecretPtr secret = secret_get(s);
     VALUE flags;
-    unsigned char *ret;
+    unsigned char *val;
     size_t value_size;
+    VALUE ret;
+    int exception = 0;
+    struct rb_str_new_arg args;
 
     rb_scan_args(argc, argv, "01", &flags);
 
     if (NIL_P(flags))
         flags = INT2FIX(0);
 
-    ret = virSecretGetValue(secret, &value_size, NUM2UINT(flags));
+    val = virSecretGetValue(secret, &value_size, NUM2UINT(flags));
 
-    _E(ret == NULL, create_error(e_RetrieveError, "virSecretGetValue", "", conn(s)));
+    _E(val == NULL, create_error(e_RetrieveError, "virSecretGetValue",
+                                 conn(s)));
 
-    return rb_str_new((char *)ret, value_size);
+    args.val = (char *)val;
+    args.size = value_size;
+    ret = rb_protect(rb_str_new_wrap, (VALUE)&args, &exception);
+    if (exception) {
+        free(val);
+        rb_jump_tag(exception);
+    }
+
+    free(val);
+
+    return ret;
 }
 
 /*
@@ -234,6 +166,7 @@ static VALUE libvirt_secret_get_value(int argc, VALUE *argv, VALUE s) {
  *   secret.undefine -> nil
  *
  * Call +virSecretUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretUndefine]
+ * to undefine this secret.
  */
 static VALUE libvirt_secret_undefine(VALUE s) {
     gen_call_void(virSecretUndefine, conn(s), secret_get(s));
@@ -244,6 +177,7 @@ static VALUE libvirt_secret_undefine(VALUE s) {
  *   secret.free -> nil
  *
  * Call +virSecretFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretFree]
+ * to free this secret.  After this call the secret object is no longer valid.
  */
 static VALUE libvirt_secret_free(VALUE s) {
     gen_call_free(Secret, s);
@@ -263,18 +197,6 @@ void init_secret()
                     INT2NUM(VIR_SECRET_USAGE_TYPE_VOLUME));
     rb_define_attr(c_secret, "connection", 1, 0);
 
-    /* Secret lookup/creation methods */
-    rb_define_method(c_connect, "num_of_secrets",
-                     libvirt_conn_num_of_secrets, 0);
-    rb_define_method(c_connect, "list_secrets",
-                     libvirt_conn_list_secrets, 0);
-    rb_define_method(c_connect, "lookup_secret_by_uuid",
-                     libvirt_conn_lookup_secret_by_uuid, 1);
-    rb_define_method(c_connect, "lookup_secret_by_usage",
-                     libvirt_conn_lookup_secret_by_usage, -1);
-    rb_define_method(c_connect, "define_secret_xml",
-                     libvirt_conn_define_secret_xml, -1);
-
     /* Secret object methods */
     rb_define_method(c_secret, "uuid", libvirt_secret_uuid, 0);
     rb_define_method(c_secret, "usagetype", libvirt_secret_usagetype, 0);