ruby-libvirt 0.2.0 → 0.3.0

data/ext/libvirt/domain.h

@@ -3,6 +3,10 @@
 
 extern VALUE c_domain;
 
+void domain_free(void *d);
+VALUE domain_new(virDomainPtr d, VALUE conn);
+virDomainPtr domain_get(VALUE s);
+
 void init_domain();
 
 #endif

data/ext/libvirt/extconf.rb

@@ -1,5 +1,7 @@
 require 'mkmf'
 
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
 def have_libvirt_funcs(funcs)
     funcs.each { |f| have_func(f, "libvirt/libvirt.h") }
 end
@@ -8,6 +10,41 @@ def have_libvirt_types(types)
     types.each { |t| have_type(t, "libvirt/libvirt.h") }
 end
 
+def libvirt_checking_message(target, place = nil, opt = nil)
+  [["in", place], ["with", opt]].inject("#{target}") do |msg, (pre, noun)|
+    if noun
+      [[:to_str], [:join, ","], [:to_s]].each do |meth, *args|
+        if noun.respond_to?(meth)
+          break noun = noun.send(meth, *args)
+        end
+      end
+      msg << " #{pre} #{noun}" unless noun.empty?
+    end
+    msg
+  end
+end
+
+def have_const(const, headers = nil, opt = "", &b)
+  checking_for libvirt_checking_message(const, headers, opt) do
+    headers = cpp_include(headers)
+    if try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+static int t = #{const};
+SRC
+      $defs.push(format("-DHAVE_CONST_%s", const.strip.upcase.tr_s("^A-Z0-9_", "_")))
+      true
+    else
+      false
+    end
+  end
+end
+
+def have_libvirt_consts(consts)
+  consts.each { |c| have_const(c, "libvirt/libvirt.h") }
+end
+
 extension_name = '_libvirt'
 
 dir_config(extension_name)
@@ -26,11 +63,13 @@ libvirt_types = [ 'virNetworkPtr',
                   'virDomainMemoryStatPtr',
                   'virDomainSnapshotPtr',
                   'virDomainJobInfoPtr',
+                  'virNodeDevicePtr',
                 ]
 
 libvirt_funcs = [ 'virStorageVolWipe',
                   'virStoragePoolIsActive',
                   'virStoragePoolIsPersistent',
+                  'virStorageVolCreateXMLFrom',
                   'virConnectGetLibVersion',
                   'virConnectIsEncrypted',
                   'virConnectIsSecure',
@@ -46,10 +85,61 @@ libvirt_funcs = [ 'virStorageVolWipe',
                   'virDomainIsPersistent',
                   'virConnectDomainXMLFromNative',
                   'virConnectDomainXMLToNative',
+                  'virDomainCreateWithFlags',
+                  'virDomainAttachDeviceFlags',
+                  'virDomainDetachDeviceFlags',
+                  'virDomainUpdateDeviceFlags',
+                  'virNodeGetSecurityModel',
+                  'virDomainCreateXML',
+                  'virDomainGetSecurityLabel',
+                  'virConnectCompareCPU',
+                  'virConnectBaselineCPU',
+                  'virDomainSetVcpusFlags',
+                  'virDomainGetVcpusFlags',
+                  'virConnectDomainEventRegisterAny',
+                  'virConnectDomainEventRegister',
+                  'virDomainBlockPeek',
+                  'virDomainMemoryPeek',
+                  'virConnectOpenAuth',
+                  'virEventRegisterImpl',
                 ]
 
+libvirt_consts = [ 'VIR_MIGRATE_LIVE',
+                   'VIR_MIGRATE_PEER2PEER',
+                   'VIR_MIGRATE_TUNNELLED',
+                   'VIR_MIGRATE_PERSIST_DEST',
+                   'VIR_MIGRATE_UNDEFINE_SOURCE',
+                   'VIR_MIGRATE_PAUSED',
+                   'VIR_MIGRATE_NON_SHARED_DISK',
+                   'VIR_MIGRATE_NON_SHARED_INC',
+                   'VIR_DOMAIN_XML_UPDATE_CPU',
+                   'VIR_MEMORY_PHYSICAL',
+                   'VIR_DOMAIN_START_PAUSED',
+                   'VIR_DUMP_CRASH',
+                   'VIR_DUMP_LIVE',
+                   'VIR_DOMAIN_DEVICE_MODIFY_CURRENT',
+                   'VIR_DOMAIN_DEVICE_MODIFY_CONFIG',
+                   'VIR_DOMAIN_DEVICE_MODIFY_FORCE',
+                   'VIR_INTERFACE_XML_INACTIVE',
+                   'VIR_STORAGE_POOL_INACCESSIBLE',
+                   'VIR_DOMAIN_EVENT_DEFINED',
+                   'VIR_DOMAIN_EVENT_STARTED',
+                   'VIR_DOMAIN_EVENT_SUSPENDED_IOERROR',
+                   'VIR_DOMAIN_EVENT_ID_WATCHDOG',
+                   'VIR_DOMAIN_EVENT_ID_IO_ERROR',
+                   'VIR_DOMAIN_EVENT_ID_GRAPHICS',
+                   'VIR_DOMAIN_EVENT_ID_REBOOT',
+                   'VIR_DOMAIN_EVENT_ID_RTC_CHANGE',
+                   'VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON',
+                 ]
+
 have_libvirt_types(libvirt_types)
 have_libvirt_funcs(libvirt_funcs)
+if find_header("libvirt/libvirt-qemu.h")
+    have_func("virDomainQemuMonitorCommand", "libvirt/libvirt-qemu.h")
+end
+
+have_libvirt_consts(libvirt_consts)
 
 create_header
 create_makefile(extension_name)

data/ext/libvirt/interface.c

@@ -36,109 +36,16 @@ static virInterfacePtr interface_get(VALUE s) {
     generic_get(Interface, s);
 }
 
-static VALUE interface_new(virInterfacePtr i, VALUE conn) {
+VALUE interface_new(virInterfacePtr i, VALUE conn) {
     return generic_new(c_interface, i, conn, interface_free);
 }
 
-/*
- * call-seq:
- *   conn.num_of_interfaces -> fixnum
- *
- * Call +virConnectNumOfInterfaces+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfInterfaces]
- */
-static VALUE libvirt_conn_num_of_interfaces(VALUE s) {
-    gen_conn_num_of(s, Interfaces);
-}
-
-/*
- * call-seq:
- *   conn.list_interfaces -> list
- *
- * Call +virConnectListInterfaces+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListInterfaces]
- */
-static VALUE libvirt_conn_list_interfaces(VALUE s) {
-    gen_conn_list_names(s, Interfaces);
-}
-
-/*
- * call-seq:
- *   conn.num_of_defined_interfaces -> fixnum
- *
- * Call +virConnectNumOfDefinedInterfaces+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfDefinedInterfaces]
- */
-static VALUE libvirt_conn_num_of_defined_interfaces(VALUE s) {
-    gen_conn_num_of(s, DefinedInterfaces);
-}
-
-/*
- * call-seq:
- *   conn.list_defined_interfaces -> list
- *
- * Call +virConnectListDefinedInterfaces+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListDefinedInterfaces]
- */
-static VALUE libvirt_conn_list_defined_interfaces(VALUE s) {
-    gen_conn_list_names(s, DefinedInterfaces);
-}
-
-/*
- * call-seq:
- *   conn.lookup_interface_by_name -> Libvirt::Interface
- *
- * Call +virInterfaceLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceLookupByName]
- */
-static VALUE libvirt_conn_lookup_interface_by_name(VALUE c, VALUE name) {
-    virInterfacePtr iface;
-    virConnectPtr conn = connect_get(c);
-
-    iface = virInterfaceLookupByName(conn, StringValueCStr(name));
-    _E(iface == NULL, create_error(e_RetrieveError, "virInterfaceLookupByName", "", conn));
-
-    return interface_new(iface, c);
-}
-
-/*
- * call-seq:
- *   conn.lookup_interface_by_mac -> Libvirt::Interface
- *
- * Call +virInterfaceLookupByMACString+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceLookupByMACString]
- */
-static VALUE libvirt_conn_lookup_interface_by_mac(VALUE c, VALUE mac) {
-    virInterfacePtr iface;
-    virConnectPtr conn = connect_get(c);
-
-    iface = virInterfaceLookupByMACString(conn, StringValueCStr(mac));
-    _E(iface == NULL, create_error(e_RetrieveError, "virInterfaceLookupByMACString", "", conn));
-
-    return interface_new(iface, c);
-}
-
-/*
- * call-seq:
- *   conn.define_interface_xml -> Libvirt::Interface
- *
- * Call +virInterfaceDefineXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceDefineXML]
- */
-static VALUE libvirt_conn_define_interface_xml(int argc, VALUE *argv, VALUE c) {
-    virInterfacePtr iface;
-    virConnectPtr conn = connect_get(c);
-    VALUE xml, flags;
-
-    rb_scan_args(argc, argv, "11", &xml, &flags);
-
-    if (NIL_P(flags))
-        flags = INT2FIX(0);
-
-    iface = virInterfaceDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
-    _E(iface == NULL, create_error(e_DefinitionError, "virInterfaceDefineXML", "", conn));
-
-    return interface_new(iface, c);
-}
-
 /*
  * call-seq:
  *   interface.undefine -> nil
  *
  * Call +virInterfaceUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceUndefine]
+ * to undefine this interface.
  */
 static VALUE libvirt_interface_undefine(VALUE s) {
     gen_call_void(virInterfaceUndefine, conn(s), interface_get(s));
@@ -146,22 +53,38 @@ static VALUE libvirt_interface_undefine(VALUE s) {
 
 /*
  * call-seq:
- *   interface.create -> nil
+ *   interface.create(flags=0) -> nil
  *
  * Call +virInterfaceCreate+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceCreate]
+ * to start this interface.
  */
-static VALUE libvirt_interface_create(VALUE s) {
-    gen_call_void(virInterfaceCreate, conn(s), interface_get(s), 0);
+static VALUE libvirt_interface_create(int argc, VALUE *argv, VALUE s) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+    if (NIL_P(flags))
+        flags = INT2FIX(0);
+
+    gen_call_void(virInterfaceCreate, conn(s), interface_get(s),
+                  NUM2UINT(flags));
 }
 
 /*
  * call-seq:
- *   interface.destroy -> nil
+ *   interface.destroy(flags=0) -> nil
  *
  * Call +virInterfaceDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceDestroy]
+ * to shutdown this interface.
  */
-static VALUE libvirt_interface_destroy(VALUE s) {
-    gen_call_void(virInterfaceDestroy, conn(s), interface_get(s), 0);
+static VALUE libvirt_interface_destroy(int argc, VALUE *argv, VALUE s) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+    if (NIL_P(flags))
+        flags = INT2FIX(0);
+
+    gen_call_void(virInterfaceDestroy, conn(s), interface_get(s),
+                  NUM2UINT(flags));
 }
 
 #if HAVE_VIRINTERFACEISACTIVE
@@ -170,6 +93,7 @@ static VALUE libvirt_interface_destroy(VALUE s) {
  *   interface.active? -> [true|false]
  *
  * Call +virInterfaceIsActive+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceIsActive]
+ * to determine if this interface is currently active.
  */
 static VALUE libvirt_interface_active_p(VALUE p) {
     gen_call_truefalse(virInterfaceIsActive, conn(p), interface_get(p));
@@ -181,6 +105,7 @@ static VALUE libvirt_interface_active_p(VALUE p) {
  *   interface.name -> string
  *
  * Call +virInterfaceGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetName]
+ * to retrieve the name of this interface.
  */
 static VALUE libvirt_interface_name(VALUE s) {
     gen_call_string(virInterfaceGetName, conn(s), 0, interface_get(s));
@@ -191,6 +116,7 @@ static VALUE libvirt_interface_name(VALUE s) {
  *   interface.mac -> string
  *
  * Call +virInterfaceGetMACString+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetMACString]
+ * to retrieve the MAC address of this interface.
  */
 static VALUE libvirt_interface_mac(VALUE s) {
     gen_call_string(virInterfaceGetMACString, conn(s), 0, interface_get(s));
@@ -201,6 +127,7 @@ static VALUE libvirt_interface_mac(VALUE s) {
  *   interface.xml_desc -> string
  *
  * Call +virInterfaceGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetXMLDesc]
+ * to retrieve the XML of this interface.
  */
 static VALUE libvirt_interface_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -214,6 +141,16 @@ static VALUE libvirt_interface_xml_desc(int argc, VALUE *argv, VALUE s) {
                     NUM2UINT(flags));
 }
 
+/*
+ * call-seq:
+ *   interface.free -> nil
+ *
+ * Call +virInterfaceFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceFree]
+ * to free this interface.  The object will no longer be valid after this call.
+ */
+static VALUE libvirt_interface_free(VALUE s) {
+    gen_call_free(Interface, s);
+}
 #endif
 
 /*
@@ -223,28 +160,12 @@ void init_interface()
 {
 #if HAVE_TYPE_VIRINTERFACEPTR
     c_interface = rb_define_class_under(m_libvirt, "Interface", rb_cObject);
-#ifdef VIR_INTERFACE_XML_INACTIVE
+#if HAVE_CONST_VIR_INTERFACE_XML_INACTIVE
     rb_define_const(c_interface, "XML_INACTIVE",
                     INT2NUM(VIR_INTERFACE_XML_INACTIVE));
 #endif
     rb_define_attr(c_interface, "connection", 1, 0);
 
-    /* Interface lookup/creation methods */
-    rb_define_method(c_connect, "num_of_interfaces",
-                     libvirt_conn_num_of_interfaces, 0);
-    rb_define_method(c_connect, "list_interfaces",
-                     libvirt_conn_list_interfaces, 0);
-    rb_define_method(c_connect, "num_of_defined_interfaces",
-                     libvirt_conn_num_of_defined_interfaces, 0);
-    rb_define_method(c_connect, "list_defined_interfaces",
-                     libvirt_conn_list_defined_interfaces, 0);
-    rb_define_method(c_connect, "lookup_interface_by_name",
-                     libvirt_conn_lookup_interface_by_name, 1);
-    rb_define_method(c_connect, "lookup_interface_by_mac",
-                     libvirt_conn_lookup_interface_by_mac, 1);
-    rb_define_method(c_connect, "define_interface_xml",
-                     libvirt_conn_define_interface_xml, -1);
-
     /* Interface object methods */
     rb_define_method(c_interface, "name", libvirt_interface_name, 0);
     rb_define_method(c_interface, "mac", libvirt_interface_mac, 0);
@@ -252,6 +173,7 @@ void init_interface()
     rb_define_method(c_interface, "undefine", libvirt_interface_undefine, 0);
     rb_define_method(c_interface, "create", libvirt_interface_create, -1);
     rb_define_method(c_interface, "destroy", libvirt_interface_destroy, -1);
+    rb_define_method(c_interface, "free", libvirt_interface_free, 0);
 #if HAVE_VIRINTERFACEISACTIVE
     rb_define_method(c_interface, "active?", libvirt_interface_active_p, 0);
 #endif

data/ext/libvirt/network.c

@@ -36,119 +36,16 @@ static virNetworkPtr network_get(VALUE s) {
     generic_get(Network, s);
 }
 
-static VALUE network_new(virNetworkPtr n, VALUE conn) {
+VALUE network_new(virNetworkPtr n, VALUE conn) {
     return generic_new(c_network, n, conn, network_free);
 }
 
-/*
- * call-seq:
- *   conn.num_of_networks -> fixnum
- *
- * Call +virConnectNumOfNetworks+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfNetworks]
- */
-static VALUE libvirt_conn_num_of_networks(VALUE s) {
-    gen_conn_num_of(s, Networks);
-}
-
-/*
- * call-seq:
- *   conn.list_networks -> list
- *
- * Call +virConnectListNetworks+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListNetworks]
- */
-static VALUE libvirt_conn_list_networks(VALUE s) {
-    gen_conn_list_names(s, Networks);
-}
-
-/*
- * call-seq:
- *   conn.num_of_defined_networks -> fixnum
- *
- * Call +virConnectNumOfDefinedNetworks+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectNumOfDefinedNetworks]
- */
-static VALUE libvirt_conn_num_of_defined_networks(VALUE s) {
-    gen_conn_num_of(s, DefinedNetworks);
-}
-
-/*
- * call-seq:
- *   conn.list_of_defined_networks -> list
- *
- * Call +virConnectListDefinedNetworks+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectListDefinedNetworks]
- */
-static VALUE libvirt_conn_list_defined_networks(VALUE s) {
-    gen_conn_list_names(s, DefinedNetworks);
-}
-
-/*
- * call-seq:
- *   conn.lookup_network_by_name -> Libvirt::Network
- *
- * Call +virNetworkLookupByName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkLookupByName]
- */
-static VALUE libvirt_conn_lookup_network_by_name(VALUE c, VALUE name) {
-    virNetworkPtr netw;
-    virConnectPtr conn = connect_get(c);
-
-    netw = virNetworkLookupByName(conn, StringValueCStr(name));
-    _E(netw == NULL, create_error(e_RetrieveError, "virNetworkLookupByName", "", conn));
-
-    return network_new(netw, c);
-}
-
-/*
- * call-seq:
- *   conn.lookup_network_by_uuid -> Libvirt::Network
- *
- * Call +virNetworkLookupByUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkLookupByUUIDString]
- */
-static VALUE libvirt_conn_lookup_network_by_uuid(VALUE c, VALUE uuid) {
-    virNetworkPtr netw;
-    virConnectPtr conn = connect_get(c);
-
-    netw = virNetworkLookupByUUIDString(conn, StringValueCStr(uuid));
-    _E(netw == NULL, create_error(e_RetrieveError, "virNetworkLookupByUUID", "", conn));
-
-    return network_new(netw, c);
-}
-
-/*
- * call-seq:
- *   conn.create_network_xml -> Libvirt::Network
- *
- * Call +virNetworkCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkCreateXML]
- */
-static VALUE libvirt_conn_create_network_xml(VALUE c, VALUE xml) {
-    virNetworkPtr netw;
-    virConnectPtr conn = connect_get(c);
-
-    netw = virNetworkCreateXML(conn, StringValueCStr(xml));
-    _E(netw == NULL, create_error(e_Error, "virNetworkCreateXML", "", conn));
-
-    return network_new(netw, c);
-}
-
-/*
- * call-seq:
- *   conn.define_network_xml -> Libvirt::Network
- *
- * Call +virNetworkDefineXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkDefineXML]
- */
-static VALUE libvirt_conn_define_network_xml(VALUE c, VALUE xml) {
-    virNetworkPtr netw;
-    virConnectPtr conn = connect_get(c);
-
-    netw = virNetworkDefineXML(conn, StringValueCStr(xml));
-    _E(netw == NULL, create_error(e_DefinitionError, "virNetworkDefineXML", "", conn));
-
-    return network_new(netw, c);
-}
-
 /*
  * call-seq:
  *   net.undefine -> nil
  *
  * Call +virNetworkUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkUndefine]
+ * to undefine this network.
  */
 static VALUE libvirt_netw_undefine(VALUE s) {
     gen_call_void(virNetworkUndefine, conn(s), network_get(s));
@@ -159,6 +56,7 @@ static VALUE libvirt_netw_undefine(VALUE s) {
  *   net.create -> nil
  *
  * Call +virNetworkCreate+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkCreate]
+ * to start this network.
  */
 static VALUE libvirt_netw_create(VALUE s) {
     gen_call_void(virNetworkCreate, conn(s), network_get(s));
@@ -169,6 +67,7 @@ static VALUE libvirt_netw_create(VALUE s) {
  *   net.destroy -> nil
  *
  * Call +virNetworkDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkDestroy]
+ * to shutdown this network.
  */
 static VALUE libvirt_netw_destroy(VALUE s) {
     gen_call_void(virNetworkDestroy, conn(s), network_get(s));
@@ -179,6 +78,7 @@ static VALUE libvirt_netw_destroy(VALUE s) {
  *   net.name -> string
  *
  * Call +virNetworkGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetName]
+ * to retrieve the name of this network.
  */
 static VALUE libvirt_netw_name(VALUE s) {
     gen_call_string(virNetworkGetName, conn(s), 0, network_get(s));
@@ -189,6 +89,7 @@ static VALUE libvirt_netw_name(VALUE s) {
  *   net.uuid -> string
  *
  * Call +virNetworkGetUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetUUIDString]
+ * to retrieve the UUID of this network.
  */
 static VALUE libvirt_netw_uuid(VALUE s) {
     virNetworkPtr netw = network_get(s);
@@ -196,16 +97,18 @@ static VALUE libvirt_netw_uuid(VALUE s) {
     int r;
 
     r = virNetworkGetUUIDString(netw, uuid);
-    _E(r < 0, create_error(e_RetrieveError, "virNetworkGetUUIDString", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virNetworkGetUUIDString",
+                           conn(s)));
 
     return rb_str_new2((char *) uuid);
 }
 
 /*
  * call-seq:
- *   net.xml_desc -> string
+ *   net.xml_desc(flags=0) -> string
  *
  * Call +virNetworkGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetXMLDesc]
+ * to retrieve the XML for this network.
  */
 static VALUE libvirt_netw_xml_desc(int argc, VALUE *argv, VALUE s) {
     VALUE flags;
@@ -224,6 +127,7 @@ static VALUE libvirt_netw_xml_desc(int argc, VALUE *argv, VALUE s) {
  *   net.bridge_name -> string
  *
  * Call +virNetworkGetBridgeName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetBridgeName]
+ * to retrieve the bridge name for this network.
  */
 static VALUE libvirt_netw_bridge_name(VALUE s) {
     gen_call_string(virNetworkGetBridgeName, conn(s), 1, network_get(s));
@@ -234,24 +138,30 @@ static VALUE libvirt_netw_bridge_name(VALUE s) {
  *   net.autostart? -> [true|false]
  *
  * Call +virNetworkGetAutostart+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetAutostart]
+ * to determine if this network will be autostarted when libvirtd starts.
  */
 static VALUE libvirt_netw_autostart(VALUE s){
     virNetworkPtr netw = network_get(s);
     int r, autostart;
 
     r = virNetworkGetAutostart(netw, &autostart);
-    _E(r < 0, create_error(e_RetrieveError, "virNetworkAutostart", "", conn(s)));
+    _E(r < 0, create_error(e_RetrieveError, "virNetworkAutostart", conn(s)));
 
     return autostart ? Qtrue : Qfalse;
 }
 
 /*
  * call-seq:
- *   net.autostart_set -> nil
+ *   net.autostart = [true|false]
  *
  * Call +virNetworkSetAutostart+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkSetAutostart]
+ * to set this network to be autostarted when libvirtd starts.
  */
 static VALUE libvirt_netw_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(virNetworkSetAutostart, conn(s), network_get(s),
                   RTEST(autostart) ? 1 : 0);
 }
@@ -261,6 +171,7 @@ static VALUE libvirt_netw_autostart_set(VALUE s, VALUE autostart) {
  *   net.free -> nil
  *
  * Call +virNetworkFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkFree]
+ * to free this network.  The object will no longer be valid after this call.
  */
 static VALUE libvirt_netw_free(VALUE s) {
     gen_call_free(Network, s);
@@ -272,6 +183,7 @@ static VALUE libvirt_netw_free(VALUE s) {
  *   net.active? -> [true|false]
  *
  * Call +virNetworkIsActive+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkIsActive]
+ * to determine if this network is currently active.
  */
 static VALUE libvirt_netw_active_p(VALUE s) {
     gen_call_truefalse(virNetworkIsActive, conn(s), network_get(s));
@@ -284,6 +196,7 @@ static VALUE libvirt_netw_active_p(VALUE s) {
  *   net.persistent? -> [true|false]
  *
  * Call +virNetworkIsPersistent+[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkIsPersistent]
+ * to determine if this network is persistent.
  */
 static VALUE libvirt_netw_persistent_p(VALUE s) {
     gen_call_truefalse(virNetworkIsPersistent, conn(s), network_get(s));
@@ -301,22 +214,6 @@ void init_network()
     c_network = rb_define_class_under(m_libvirt, "Network", rb_cObject);
     rb_define_attr(c_network, "connection", 1, 0);
 
-    rb_define_method(c_connect, "num_of_networks",
-                     libvirt_conn_num_of_networks, 0);
-    rb_define_method(c_connect, "list_networks", libvirt_conn_list_networks, 0);
-    rb_define_method(c_connect, "num_of_defined_networks",
-                     libvirt_conn_num_of_defined_networks, 0);
-    rb_define_method(c_connect, "list_defined_networks",
-                     libvirt_conn_list_defined_networks, 0);
-    rb_define_method(c_connect, "lookup_network_by_name",
-                     libvirt_conn_lookup_network_by_name, 1);
-    rb_define_method(c_connect, "lookup_network_by_uuid",
-                     libvirt_conn_lookup_network_by_uuid, 1);
-    rb_define_method(c_connect, "create_network_xml",
-                     libvirt_conn_create_network_xml, 1);
-    rb_define_method(c_connect, "define_network_xml",
-                     libvirt_conn_define_network_xml, 1);
-
     rb_define_method(c_network, "undefine", libvirt_netw_undefine, 0);
     rb_define_method(c_network, "create", libvirt_netw_create, 0);
     rb_define_method(c_network, "destroy", libvirt_netw_destroy, 0);