ruby-libvirt 0.2.0 → 0.3.0

data/ext/libvirt/storage.c

@@ -50,165 +50,33 @@ static virStoragePoolPtr pool_get(VALUE s) {
     generic_get(StoragePool, s);
 }
 
-static VALUE pool_new(virStoragePoolPtr n, VALUE conn) {
+VALUE pool_new(virStoragePoolPtr n, VALUE conn) {
     return generic_new(c_storage_pool, n, conn, pool_free);
 }
 
 /*
  * call-seq:
- *   conn.list_storage_pools -> list
- *
- * Call +virConnectListStoragePools+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListStoragePools]
- */
-static VALUE libvirt_conn_list_storage_pools(VALUE s) {
-    gen_conn_list_names(s, StoragePools);
-}
-
-/*
- * call-seq:
- *   conn.num_of_storage_pools -> fixnum
- *
- * Call +virConnectNumOfStoragePools+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfStoragePools]
- */
-static VALUE libvirt_conn_num_of_storage_pools(VALUE s) {
-    gen_conn_num_of(s, StoragePools);
-}
-
-/*
- * call-seq:
- *   conn.list_defined_storage_pools -> list
- *
- * Call +virConnectListDefinedStoragePools+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListDefinedStoragePools]
- */
-static VALUE libvirt_conn_list_defined_storage_pools(VALUE s) {
-    gen_conn_list_names(s, DefinedStoragePools);
-}
-
-/*
- * call-seq:
- *   conn.num_of_defined_storage_pools -> fixnum
- *
- * Call +virConnectNumOfDefinedStoragePools+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfDefinedStoragePools]
- */
-static VALUE libvirt_conn_num_of_defined_storage_pools(VALUE s) {
-    gen_conn_num_of(s, DefinedStoragePools);
-}
-
-/*
- * call-seq:
- *   conn.lookup_pool_by_name -> Libvirt::StoragePool
- *
- * Call +virStoragePoolLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolLookupByName]
- */
-static VALUE libvirt_conn_lookup_pool_by_name(VALUE c, VALUE name) {
-    virStoragePoolPtr pool;
-    virConnectPtr conn = connect_get(c);
-
-    pool = virStoragePoolLookupByName(conn, StringValueCStr(name));
-    _E(pool == NULL, create_error(e_RetrieveError, "virStoragePoolLookupByName", "", conn));
-
-    return pool_new(pool, c);
-}
-
-/*
- * call-seq:
- *   conn.lookup_pool_by_uuid -> Libvirt::StoragePool
- *
- * Call +virStoragePoolLookupByUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolLookupByUUIDString]
- */
-static VALUE libvirt_conn_lookup_pool_by_uuid(VALUE c, VALUE uuid) {
-    virStoragePoolPtr pool;
-    virConnectPtr conn = connect_get(c);
-
-    pool = virStoragePoolLookupByUUIDString(conn, StringValueCStr(uuid));
-    _E(pool == NULL, create_error(e_RetrieveError, "virStoragePoolLookupByUUID", "", conn));
-
-    return pool_new(pool, c);
-}
-
-/*
- * call-seq:
- *   vol.get_pool -> Libvirt::StoragePool
+ *   vol.pool -> Libvirt::StoragePool
  *
  * Call +virStoragePoolLookupByVolume+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolLookupByVolume]
+ * to retrieve the storage pool for this volume.
  */
 static VALUE libvirt_vol_get_pool(VALUE v) {
     virStoragePoolPtr pool;
 
     pool = virStoragePoolLookupByVolume(vol_get(v));
-    _E(pool == NULL, create_error(e_RetrieveError, "virStoragePoolLookupByVolume", "", conn(v)));
+    _E(pool == NULL, create_error(e_RetrieveError,
+                                  "virStoragePoolLookupByVolume", conn(v)));
 
     return pool_new(pool, conn_attr(v));
 }
 
 /*
  * call-seq:
- *   conn.create_pool_xml -> Libvirt::StoragePool
- *
- * Call +virStoragePoolCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolCreateXML]
- */
-static VALUE libvirt_conn_create_pool_xml(int argc, VALUE *argv, VALUE c) {
-    virStoragePoolPtr pool;
-    virConnectPtr conn = connect_get(c);
-    VALUE xml, flags;
-
-    rb_scan_args(argc, argv, "11", &xml, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    pool = virStoragePoolCreateXML(conn, StringValueCStr(xml), NUM2UINT(flags));
-    _E(pool == NULL, create_error(e_Error, "virStoragePoolCreateXML", "", conn));
-
-    return pool_new(pool, c);
-}
-
-/*
- * call-seq:
- *   conn.define_pool_xml -> Libvirt::StoragePool
- *
- * Call +virStoragePoolDefineXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolDefineXML]
- */
-static VALUE libvirt_conn_define_pool_xml(int argc, VALUE *argv, VALUE c) {
-    virStoragePoolPtr pool;
-    virConnectPtr conn = connect_get(c);
-    VALUE xml, flags;
-
-    rb_scan_args(argc, argv, "11", &xml, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    pool = virStoragePoolDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
-    _E(pool == NULL, create_error(e_DefinitionError, "virStoragePoolDefineXML", "", conn));
-
-    return pool_new(pool, c);
-}
-
-/*
- * call-seq:
- *   conn.find_storage_pool_sources -> string
- *
- * Call +virConnectFindStoragePoolSources+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectFindStoragePoolSources]
- */
-static VALUE libvirt_conn_find_storage_pool_sources(int argc, VALUE *argv, VALUE c) {
-    VALUE type, srcSpec_val, flags;
-
-    rb_scan_args(argc, argv, "12", &type, &srcSpec_val, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    gen_call_string(virConnectFindStoragePoolSources, conn(c), 1,
-                    connect_get(c), StringValueCStr(type),
-                    get_string_or_nil(srcSpec_val), NUM2UINT(flags));
-}
-
-/*
- * call-seq:
- *   pool.build -> nil
+ *   pool.build(flags=0) -> nil
  *
  * Call +virStoragePoolBuild+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolBuild]
+ * to build this storage pool.
  */
 static VALUE libvirt_pool_build(int argc, VALUE *argv, VALUE p) {
     VALUE flags;
@@ -226,6 +94,7 @@ static VALUE libvirt_pool_build(int argc, VALUE *argv, VALUE p) {
  *   pool.undefine -> nil
  *
  * Call +virStoragePoolUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolUndefine]
+ * to undefine this storage pool.
  */
 static VALUE libvirt_pool_undefine(VALUE p) {
     gen_call_void(virStoragePoolUndefine, conn(p), pool_get(p));
@@ -233,9 +102,10 @@ static VALUE libvirt_pool_undefine(VALUE p) {
 
 /*
  * call-seq:
- *   pool.create -> nil
+ *   pool.create(flags=0) -> nil
  *
  * Call +virStoragePoolCreate+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolCreate]
+ * to start this storage pool.
  */
 static VALUE libvirt_pool_create(int argc, VALUE *argv, VALUE p) {
     VALUE flags;
@@ -253,6 +123,7 @@ static VALUE libvirt_pool_create(int argc, VALUE *argv, VALUE p) {
  *   pool.destroy -> nil
  *
  * Call +virStoragePoolDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolDestroy]
+ * to shutdown this storage pool.
  */
 static VALUE libvirt_pool_destroy(VALUE p) {
     gen_call_void(virStoragePoolDestroy, conn(p), pool_get(p));
@@ -260,9 +131,11 @@ static VALUE libvirt_pool_destroy(VALUE p) {
 
 /*
  * call-seq:
- *   pool.delete -> nil
+ *   pool.delete(flags=0) -> nil
  *
  * Call +virStoragePoolDelete+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolDelete]
+ * to delete the data corresponding to this data pool.  This is a destructive
+ * operation.
  */
 static VALUE libvirt_pool_delete(int argc, VALUE *argv, VALUE p) {
     VALUE flags;
@@ -277,9 +150,10 @@ static VALUE libvirt_pool_delete(int argc, VALUE *argv, VALUE p) {
 
 /*
  * call-seq:
- *   pool.refresh -> nil
+ *   pool.refresh(flags=0) -> nil
  *
  * Call +virStoragePoolRefresh+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolRefresh]
+ * to refresh the list of volumes in this storage pool.
  */
 static VALUE libvirt_pool_refresh(int argc, VALUE *argv, VALUE p) {
     VALUE flags;
@@ -297,6 +171,7 @@ static VALUE libvirt_pool_refresh(int argc, VALUE *argv, VALUE p) {
  *   pool.name -> string
  *
  * Call +virStoragePoolGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetName]
+ * to retrieve the name of this storage pool.
  */
 static VALUE libvirt_pool_name(VALUE s) {
     gen_call_string(virStoragePoolGetName, conn(s), 0, pool_get(s));
@@ -307,13 +182,15 @@ static VALUE libvirt_pool_name(VALUE s) {
  *   pool.uuid -> string
  *
  * Call +virStoragePoolGetUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetUUIDString]
+ * to retrieve the UUID of this storage pool.
  */
 static VALUE libvirt_pool_uuid(VALUE s) {
     char uuid[VIR_UUID_STRING_BUFLEN];
     int r;
 
     r = virStoragePoolGetUUIDString(pool_get(s), uuid);
-    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetUUIDString", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetUUIDString",
+                           conn(s)));
 
     return rb_str_new2((char *) uuid);
 }
@@ -323,6 +200,7 @@ static VALUE libvirt_pool_uuid(VALUE s) {
  *   pool.info -> Libvirt::StoragePoolInfo
  *
  * Call +virStoragePoolGetInfo+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetInfo]
+ * to retrieve information about this storage pool.
  */
 static VALUE libvirt_pool_info(VALUE s) {
     virStoragePoolInfo info;
@@ -330,7 +208,7 @@ static VALUE libvirt_pool_info(VALUE s) {
     VALUE result;
 
     r = virStoragePoolGetInfo(pool_get(s), &info);
-    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetInfo", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetInfo", conn(s)));
 
     result = rb_class_new_instance(0, NULL, c_storage_pool_info);
     rb_iv_set(result, "@state", INT2FIX(info.state));
@@ -343,9 +221,10 @@ static VALUE libvirt_pool_info(VALUE s) {
 
 /*
  * call-seq:
- *   pool.xml_desc -> string
+ *   pool.xml_desc(flags=0) -> string
  *
  * Call +virStoragePoolGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetXMLDesc]
+ * to retrieve the XML for this storage pool.
  */
 static VALUE libvirt_pool_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -364,23 +243,30 @@ static VALUE libvirt_pool_xml_desc(int argc, VALUE *argv, VALUE s) {
  *   pool.autostart? -> [true|false]
  *
  * Call +virStoragePoolGetAutostart+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetAutostart]
+ * to determine whether this storage pool will autostart when libvirtd starts.
  */
 static VALUE libvirt_pool_autostart(VALUE s){
     int r, autostart;
 
     r = virStoragePoolGetAutostart(pool_get(s), &autostart);
-    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetAutostart", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virStoragePoolGetAutostart",
+                           conn(s)));
 
     return autostart ? Qtrue : Qfalse;
 }
 
 /*
  * call-seq:
- *   pool.autostart_set -> nil
+ *   pool.autostart = [true|false]
  *
  * Call +virStoragePoolSetAutostart+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolSetAutostart]
+ * to make this storage pool start when libvirtd starts.
  */
 static VALUE libvirt_pool_autostart_set(VALUE s, VALUE autostart) {
+    if (autostart != Qtrue && autostart != Qfalse)
+		rb_raise(rb_eTypeError,
+                 "wrong argument type (expected TrueClass or FalseClass)");
+
     gen_call_void(virStoragePoolSetAutostart, conn(s), pool_get(s),
                   RTEST(autostart) ? 1 : 0);
 }
@@ -390,12 +276,14 @@ static VALUE libvirt_pool_autostart_set(VALUE s, VALUE autostart) {
  *   pool.num_of_volumes -> fixnum
  *
  * Call +virStoragePoolNumOfVolumes+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolNumOfVolumes]
+ * to retrieve the number of volumes in this storage pool.
  */
 static VALUE libvirt_pool_num_of_volumes(VALUE s) {
     int n = virStoragePoolNumOfVolumes(pool_get(s));
-    _E(n < 0, create_error(e_RetrieveError, "virStoragePoolNumOfVolumes", "", conn(s)));
+    _E(n < 0, create_error(e_RetrieveError, "virStoragePoolNumOfVolumes",
+                           conn(s)));
 
-    return INT2FIX(n);
+    return INT2NUM(n);
 }
 
 /*
@@ -403,34 +291,28 @@ static VALUE libvirt_pool_num_of_volumes(VALUE s) {
  *   pool.list_volumes -> list
  *
  * Call +virStoragePoolListVolumes+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolListVolumes]
+ * to retrieve a list of volume names in this storage pools.
  */
 static VALUE libvirt_pool_list_volumes(VALUE s) {
-    int i, r, num;
+    int r, num;
     char **names;
     virStoragePoolPtr pool = pool_get(s);
-    VALUE result;
 
     num = virStoragePoolNumOfVolumes(pool);
-    _E(num < 0, create_error(e_RetrieveError, "virStoragePoolNumOfVolumes", "", conn(s)));
-    if (num == 0) {
-        result = rb_ary_new2(num);
-        return result;
-    }
+    _E(num < 0, create_error(e_RetrieveError, "virStoragePoolNumOfVolumes",
+                             conn(s)));
+    if (num == 0)
+        return rb_ary_new2(num);
 
     names = ALLOC_N(char *, num);
     r = virStoragePoolListVolumes(pool, names, num);
     if (r < 0) {
-        free(names);
-        _E(r < 0, create_error(e_RetrieveError, "virStoragePoolListVolumes", "", conn(s)));
+        xfree(names);
+        rb_exc_raise(create_error(e_RetrieveError, "virStoragePoolListVolumes",
+                                  conn(s)));
     }
 
-    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);
 }
 
 /*
@@ -438,6 +320,8 @@ static VALUE libvirt_pool_list_volumes(VALUE s) {
  *   pool.free -> nil
  *
  * Call +virStoragePoolFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolFree]
+ * to free this storage pool object.  After this call the storage pool object
+ * is no longer valid.
  */
 static VALUE libvirt_pool_free(VALUE s) {
     gen_call_free(StoragePool, s);
@@ -461,47 +345,53 @@ static VALUE vol_new(virStorageVolPtr n, VALUE conn) {
 
 /*
  * call-seq:
- *   pool.lookup_vol_by_name -> Libvirt::StorageVol
+ *   pool.lookup_volume_by_name(name) -> Libvirt::StorageVol
  *
  * Call +virStorageVolLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolLookupByName]
+ * to retrieve a storage volume object by name.
  */
 static VALUE libvirt_pool_lookup_vol_by_name(VALUE p, VALUE name) {
     virStorageVolPtr vol;
 
     vol = virStorageVolLookupByName(pool_get(p), StringValueCStr(name));
-    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByName", "", conn(p)));
+    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByName",
+                                 conn(p)));
 
     return vol_new(vol, conn_attr(p));
 }
 
 /*
  * call-seq:
- *   pool.lookup_vol_by_key -> Libvirt::StorageVol
+ *   pool.lookup_volume_by_key(key) -> Libvirt::StorageVol
  *
  * Call +virStorageVolLookupByKey+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolLookupByKey]
+ * to retrieve a storage volume object by key.
  */
 static VALUE libvirt_pool_lookup_vol_by_key(VALUE p, VALUE key) {
     virStorageVolPtr vol;
 
-    // FIXME: Why does this take a connection, not a pool ?
+    /* FIXME: Why does this take a connection, not a pool? */
     vol = virStorageVolLookupByKey(conn(p), StringValueCStr(key));
-    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByKey", "", conn(p)));
+    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByKey",
+                                 conn(p)));
 
     return vol_new(vol, conn_attr(p));
 }
 
 /*
  * call-seq:
- *   pool.lookup_vol_by_path -> Libvirt::StorageVol
+ *   pool.lookup_volume_by_path(path) -> Libvirt::StorageVol
  *
  * Call +virStorageVolLookupByPath+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolLookupByPath]
+ * to retrieve a storage volume object by path.
  */
 static VALUE libvirt_pool_lookup_vol_by_path(VALUE p, VALUE path) {
     virStorageVolPtr vol;
 
-    // FIXME: Why does this take a connection, not a pool ?
+    /* FIXME: Why does this take a connection, not a pool? */
     vol = virStorageVolLookupByPath(conn(p), StringValueCStr(path));
-    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByPath", "", conn(p)));
+    _E(vol == NULL, create_error(e_RetrieveError, "virStorageVolLookupByPath",
+                                 conn(p)));
 
     return vol_new(vol, conn_attr(p));
 }
@@ -511,6 +401,7 @@ static VALUE libvirt_pool_lookup_vol_by_path(VALUE p, VALUE path) {
  *   vol.name -> string
  *
  * Call +virStorageVolGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetName]
+ * to retrieve the name of this storage volume.
  */
 static VALUE libvirt_vol_name(VALUE v) {
     gen_call_string(virStorageVolGetName, conn(v), 0, vol_get(v));
@@ -521,6 +412,7 @@ static VALUE libvirt_vol_name(VALUE v) {
  *   vol.key -> string
  *
  * Call +virStorageVolGetKey+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetKey]
+ * to retrieve the key for this storage volume.
  */
 static VALUE libvirt_vol_key(VALUE v) {
     gen_call_string(virStorageVolGetKey, conn(v), 0, vol_get(v));
@@ -528,9 +420,10 @@ static VALUE libvirt_vol_key(VALUE v) {
 
 /*
  * call-seq:
- *   pool.vol_create_xml -> Libvirt::StorageVol
+ *   pool.create_volume_xml(xml, flags=0) -> Libvirt::StorageVol
  *
  * Call +virStorageVolCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolCreateXML]
+ * to create a new storage volume from xml.
  */
 static VALUE libvirt_pool_vol_create_xml(int argc, VALUE *argv, VALUE p) {
     virStorageVolPtr vol;
@@ -544,16 +437,19 @@ static VALUE libvirt_pool_vol_create_xml(int argc, VALUE *argv, VALUE p) {
 
     vol = virStorageVolCreateXML(pool_get(p), StringValueCStr(xml),
                                  NUM2UINT(flags));
-    _E(vol == NULL, create_error(e_Error, "virNetworkCreateXML", "", c));
+    _E(vol == NULL, create_error(e_Error, "virNetworkCreateXML", c));
 
     return vol_new(vol, conn_attr(p));
 }
 
+#if HAVE_VIRSTORAGEVOLCREATEXMLFROM
 /*
  * call-seq:
- *   pool.vol_create_xml_from -> Libvirt::StorageVol
+ *   pool.create_volume_xml_from(xml, clonevol, flags=0) -> Libvirt::StorageVol
  *
- * Call +virStorageVolCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolCreateXML]
+ * Call +virStorageVolCreateXMLFrom+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolCreateXMLFrom]
+ * to clone a volume from an existing volume with the properties specified in
+ * xml.
  */
 static VALUE libvirt_pool_vol_create_xml_from(int argc, VALUE *argv, VALUE p) {
     virStorageVolPtr vol;
@@ -567,10 +463,11 @@ static VALUE libvirt_pool_vol_create_xml_from(int argc, VALUE *argv, VALUE p) {
 
     vol = virStorageVolCreateXMLFrom(pool_get(p), StringValueCStr(xml),
                                      vol_get(cloneval), NUM2UINT(flags));
-    _E(vol == NULL, create_error(e_Error, "virNetworkCreateXMLFrom", "", c));
+    _E(vol == NULL, create_error(e_Error, "virNetworkCreateXMLFrom", c));
 
     return vol_new(vol, conn_attr(p));
 }
+#endif
 
 #if HAVE_VIRSTORAGEPOOLISACTIVE
 /*
@@ -578,6 +475,7 @@ static VALUE libvirt_pool_vol_create_xml_from(int argc, VALUE *argv, VALUE p) {
  *   pool.active? -> [true|false]
  *
  * Call +virStoragePoolIsActive+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolIsActive]
+ * to determine if this storage pool is active.
  */
 static VALUE libvirt_pool_active_p(VALUE p) {
     gen_call_truefalse(virStoragePoolIsActive, conn(p), pool_get(p));
@@ -590,6 +488,7 @@ static VALUE libvirt_pool_active_p(VALUE p) {
  *   pool.persistent? -> [true|false]
  *
  * Call +virStoragePoolIsPersistent+[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolIsPersistent]
+ * to determine if this storage pool is persistent.
  */
 static VALUE libvirt_pool_persistent_p(VALUE p) {
     gen_call_truefalse(virStoragePoolIsPersistent, conn(p), pool_get(p));
@@ -598,9 +497,10 @@ static VALUE libvirt_pool_persistent_p(VALUE p) {
 
 /*
  * call-seq:
- *   vol.delete -> nil
+ *   vol.delete(flags=0) -> nil
  *
  * Call +virStorageVolDelete+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolDelete]
+ * to delete this volume.  This is a destructive operation.
  */
 static VALUE libvirt_vol_delete(int argc, VALUE *argv, VALUE v) {
     VALUE flags;
@@ -616,9 +516,10 @@ static VALUE libvirt_vol_delete(int argc, VALUE *argv, VALUE v) {
 #if HAVE_VIRSTORAGEVOLWIPE
 /*
  * call-seq:
- *   vol.wipe -> nil
+ *   vol.wipe(flags=0) -> nil
  *
  * Call +virStorageVolWipe+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolWipe]
+ * to wipe the data from this storage volume.  This is a destructive operation.
  */
 static VALUE libvirt_vol_wipe(int argc, VALUE *argv, VALUE v) {
     VALUE flags;
@@ -637,6 +538,7 @@ static VALUE libvirt_vol_wipe(int argc, VALUE *argv, VALUE v) {
  *   vol.info -> Libvirt::StorageVolInfo
  *
  * Call +virStorageVolGetInfo+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetInfo]
+ * to retrieve information about this storage volume.
  */
 static VALUE libvirt_vol_info(VALUE v) {
     virStorageVolInfo info;
@@ -644,7 +546,7 @@ static VALUE libvirt_vol_info(VALUE v) {
     VALUE result;
 
     r = virStorageVolGetInfo(vol_get(v), &info);
-    _E(r < 0, create_error(e_RetrieveError, "virStorageVolGetInfo", "", conn(v)));
+    _E(r < 0, create_error(e_RetrieveError, "virStorageVolGetInfo", conn(v)));
 
     result = rb_class_new_instance(0, NULL, c_storage_vol_info);
     rb_iv_set(result, "@type", INT2NUM(info.type));
@@ -656,9 +558,10 @@ static VALUE libvirt_vol_info(VALUE v) {
 
 /*
  * call-seq:
- *   vol.xml_desc -> string
+ *   vol.xml_desc(flags=0) -> string
  *
  * Call +virStorageVolGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetXMLDesc]
+ * to retrieve the xml for this storage volume.
  */
 static VALUE libvirt_vol_xml_desc(int argc, VALUE *argv, VALUE v) {
     VALUE flags;
@@ -677,6 +580,7 @@ static VALUE libvirt_vol_xml_desc(int argc, VALUE *argv, VALUE v) {
  *   vol.path -> string
  *
  * Call +virStorageVolGetPath+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetPath]
+ * to retrieve the path for this storage volume.
  */
 static VALUE libvirt_vol_path(VALUE v) {
     gen_call_string(virStorageVolGetPath, conn(v), 1, vol_get(v));
@@ -687,6 +591,8 @@ static VALUE libvirt_vol_path(VALUE v) {
  *   vol.free -> nil
  *
  * Call +virStorageVolFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolFree]
+ * to free the storage volume object.  After this call the storage volume object
+ * is no longer valid.
  */
 static VALUE libvirt_vol_free(VALUE s) {
     gen_call_free(StorageVol, s);
@@ -707,44 +613,34 @@ void init_storage(void) {
 
     c_storage_pool = rb_define_class_under(m_libvirt, "StoragePool",
                                            rb_cObject);
-#define DEF_POOLCONST(name)                                        \
-    rb_define_const(c_storage_pool, #name, INT2NUM(VIR_STORAGE_POOL_##name))
+
     /* virStoragePoolState */
-    DEF_POOLCONST(INACTIVE);
-    DEF_POOLCONST(BUILDING);
-    DEF_POOLCONST(RUNNING);
-    DEF_POOLCONST(DEGRADED);
-#ifdef VIR_STORAGE_POOL_INACCESSIBLE
-    DEF_POOLCONST(INACCESSIBLE);
+    rb_define_const(c_storage_pool, "INACTIVE",
+                    INT2NUM(VIR_STORAGE_POOL_INACTIVE));
+    rb_define_const(c_storage_pool, "BUILDING",
+                    INT2NUM(VIR_STORAGE_POOL_BUILDING));
+    rb_define_const(c_storage_pool, "RUNNING",
+                    INT2NUM(VIR_STORAGE_POOL_RUNNING));
+    rb_define_const(c_storage_pool, "DEGRADED",
+                    INT2NUM(VIR_STORAGE_POOL_DEGRADED));
+#if HAVE_CONST_VIR_STORAGE_POOL_INACCESSIBLE
+    rb_define_const(c_storage_pool, "INACCESSIBLE",
+                    INT2NUM(VIR_STORAGE_POOL_INACCESSIBLE));
 #endif
+
     /* virStoragePoolBuildFlags */
-    DEF_POOLCONST(BUILD_NEW);
-    DEF_POOLCONST(BUILD_REPAIR);
-    DEF_POOLCONST(BUILD_RESIZE);
+    rb_define_const(c_storage_pool, "BUILD_NEW",
+                    INT2NUM(VIR_STORAGE_POOL_BUILD_NEW));
+    rb_define_const(c_storage_pool, "BUILD_REPAIR",
+                    INT2NUM(VIR_STORAGE_POOL_BUILD_REPAIR));
+    rb_define_const(c_storage_pool, "BUILD_RESIZE",
+                    INT2NUM(VIR_STORAGE_POOL_BUILD_RESIZE));
+
     /* virStoragePoolDeleteFlags */
-    DEF_POOLCONST(DELETE_NORMAL);
-    DEF_POOLCONST(DELETE_ZEROED);
-#undef DEF_POOLCONST
-
-    /* StoragePool lookup/creation methods */
-    rb_define_method(c_connect, "num_of_storage_pools",
-                     libvirt_conn_num_of_storage_pools, 0);
-    rb_define_method(c_connect, "list_storage_pools",
-                     libvirt_conn_list_storage_pools, 0);
-    rb_define_method(c_connect, "num_of_defined_storage_pools",
-                     libvirt_conn_num_of_defined_storage_pools, 0);
-    rb_define_method(c_connect, "list_defined_storage_pools",
-                     libvirt_conn_list_defined_storage_pools, 0);
-    rb_define_method(c_connect, "lookup_storage_pool_by_name",
-                     libvirt_conn_lookup_pool_by_name, 1);
-    rb_define_method(c_connect, "lookup_storage_pool_by_uuid",
-                     libvirt_conn_lookup_pool_by_uuid, 1);
-    rb_define_method(c_connect, "create_storage_pool_xml",
-                     libvirt_conn_create_pool_xml, -1);
-    rb_define_method(c_connect, "define_storage_pool_xml",
-                     libvirt_conn_define_pool_xml, -1);
-    rb_define_method(c_connect, "discover_storage_pool_sources",
-                     libvirt_conn_find_storage_pool_sources, -1);
+    rb_define_const(c_storage_pool, "DELETE_NORMAL",
+                    INT2NUM(VIR_STORAGE_POOL_DELETE_NORMAL));
+    rb_define_const(c_storage_pool, "DELETE_ZEROED",
+                    INT2NUM(VIR_STORAGE_POOL_DELETE_ZEROED));
 
     /* Creating/destroying pools */
     rb_define_method(c_storage_pool, "build", libvirt_pool_build, -1);
@@ -777,8 +673,13 @@ void init_storage(void) {
     rb_define_method(c_storage_pool, "free", libvirt_pool_free, 0);
     rb_define_method(c_storage_pool, "create_vol_xml",
                      libvirt_pool_vol_create_xml, -1);
+    rb_define_alias(c_storage_pool, "create_volume_xml", "create_vol_xml");
+#if HAVE_VIRSTORAGEVOLCREATEXMLFROM
     rb_define_method(c_storage_pool, "create_vol_xml_from",
                      libvirt_pool_vol_create_xml_from, -1);
+    rb_define_alias(c_storage_pool, "create_volume_xml_from",
+                    "create_vol_xml_from");
+#endif
 #if HAVE_VIRSTORAGEPOOLISACTIVE
     rb_define_method(c_storage_pool, "active?", libvirt_pool_active_p, 0);
 #endif
@@ -800,15 +701,16 @@ void init_storage(void) {
 
     c_storage_vol = rb_define_class_under(m_libvirt, "StorageVol",
                                           rb_cObject);
-#define DEF_VOLCONST(name)                                        \
-    rb_define_const(c_storage_vol, #name, INT2NUM(VIR_STORAGE_VOL_##name))
+
     /* virStorageVolType */
-    DEF_VOLCONST(FILE);
-    DEF_VOLCONST(BLOCK);
+    rb_define_const(c_storage_vol, "FILE", INT2NUM(VIR_STORAGE_VOL_FILE));
+    rb_define_const(c_storage_vol, "BLOCK", INT2NUM(VIR_STORAGE_VOL_BLOCK));
+
     /* virStorageVolDeleteFlags */
-    DEF_VOLCONST(DELETE_NORMAL);
-    DEF_VOLCONST(DELETE_ZEROED);
-#undef DEF_VOLCONST
+    rb_define_const(c_storage_vol, "DELETE_NORMAL",
+                    INT2NUM(VIR_STORAGE_VOL_DELETE_NORMAL));
+    rb_define_const(c_storage_vol, "DELETE_ZEROED",
+                    INT2NUM(VIR_STORAGE_VOL_DELETE_ZEROED));
 
     rb_define_method(c_storage_vol, "pool", libvirt_vol_get_pool, 0);
     rb_define_method(c_storage_vol, "name", libvirt_vol_name, 0);