ruby-libvirt 0.7.1 → 0.8.1

data/ext/libvirt/network.c

@@ -26,7 +26,6 @@
 #include "connect.h"
 #include "extconf.h"
 
-#if HAVE_TYPE_VIRNETWORKPTR
 static VALUE c_network;
 
 static void network_free(void *d)
@@ -48,7 +47,7 @@ VALUE ruby_libvirt_network_new(virNetworkPtr n, VALUE conn)
  * call-seq:
  *   net.undefine -> nil
  *
- * Call virNetworkUndefine[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkUndefine]
+ * Call virNetworkUndefine[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkUndefine]
  * to undefine this network.
  */
 static VALUE libvirt_network_undefine(VALUE n)
@@ -62,7 +61,7 @@ static VALUE libvirt_network_undefine(VALUE n)
  * call-seq:
  *   net.create -> nil
  *
- * Call virNetworkCreate[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkCreate]
+ * Call virNetworkCreate[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkCreate]
  * to start this network.
  */
 static VALUE libvirt_network_create(VALUE n)
@@ -72,12 +71,11 @@ static VALUE libvirt_network_create(VALUE n)
                                    network_get(n));
 }
 
-#if HAVE_VIRNETWORKUPDATE
 /*
  * call-seq:
  *   net.update -> nil
  *
- * Call virNetworkUpdate[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkUpdate]
+ * Call virNetworkUpdate[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkUpdate]
  * to update this network.
  */
 static VALUE libvirt_network_update(VALUE n, VALUE command, VALUE section,
@@ -89,13 +87,12 @@ static VALUE libvirt_network_update(VALUE n, VALUE command, VALUE section,
                                    NUM2UINT(section), NUM2INT(index),
                                    StringValuePtr(xml), NUM2UINT(flags));
 }
-#endif
 
 /*
  * call-seq:
  *   net.destroy -> nil
  *
- * Call virNetworkDestroy[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy]
+ * Call virNetworkDestroy[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy]
  * to shutdown this network.
  */
 static VALUE libvirt_network_destroy(VALUE n)
@@ -109,7 +106,7 @@ static VALUE libvirt_network_destroy(VALUE n)
  * call-seq:
  *   net.name -> String
  *
- * Call virNetworkGetName[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetName]
+ * Call virNetworkGetName[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetName]
  * to retrieve the name of this network.
  */
 static VALUE libvirt_network_name(VALUE n)
@@ -123,7 +120,7 @@ static VALUE libvirt_network_name(VALUE n)
  * call-seq:
  *   net.uuid -> String
  *
- * Call virNetworkGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetUUIDString]
+ * Call virNetworkGetUUIDString[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetUUIDString]
  * to retrieve the UUID of this network.
  */
 static VALUE libvirt_network_uuid(VALUE n)
@@ -136,7 +133,7 @@ static VALUE libvirt_network_uuid(VALUE n)
  * call-seq:
  *   net.xml_desc(flags=0) -> String
  *
- * Call virNetworkGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc]
+ * Call virNetworkGetXMLDesc[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc]
  * to retrieve the XML for this network.
  */
 static VALUE libvirt_network_xml_desc(int argc, VALUE *argv, VALUE n)
@@ -155,7 +152,7 @@ static VALUE libvirt_network_xml_desc(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   net.bridge_name -> String
  *
- * Call virNetworkGetBridgeName[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetBridgeName]
+ * Call virNetworkGetBridgeName[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetBridgeName]
  * to retrieve the bridge name for this network.
  */
 static VALUE libvirt_network_bridge_name(VALUE n)
@@ -169,7 +166,7 @@ static VALUE libvirt_network_bridge_name(VALUE n)
  * call-seq:
  *   net.autostart? -> [true|false]
  *
- * Call virNetworkGetAutostart[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetAutostart]
+ * Call virNetworkGetAutostart[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetAutostart]
  * to determine if this network will be autostarted when libvirtd starts.
  */
 static VALUE libvirt_network_autostart(VALUE n)
@@ -187,7 +184,7 @@ static VALUE libvirt_network_autostart(VALUE n)
  * call-seq:
  *   net.autostart = [true|false]
  *
- * Call virNetworkSetAutostart[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkSetAutostart]
+ * Call virNetworkSetAutostart[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkSetAutostart]
  * to set this network to be autostarted when libvirtd starts.
  */
 static VALUE libvirt_network_autostart_equal(VALUE n, VALUE autostart)
@@ -206,7 +203,7 @@ static VALUE libvirt_network_autostart_equal(VALUE n, VALUE autostart)
  * call-seq:
  *   net.free -> nil
  *
- * Call virNetworkFree[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkFree]
+ * Call virNetworkFree[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkFree]
  * to free this network.  The object will no longer be valid after this call.
  */
 static VALUE libvirt_network_free(VALUE n)
@@ -214,12 +211,11 @@ static VALUE libvirt_network_free(VALUE n)
     ruby_libvirt_generate_call_free(Network, n);
 }
 
-#if HAVE_VIRNETWORKISACTIVE
 /*
  * call-seq:
  *   net.active? -> [true|false]
  *
- * Call virNetworkIsActive[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsActive]
+ * Call virNetworkIsActive[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsActive]
  * to determine if this network is currently active.
  */
 static VALUE libvirt_network_active_p(VALUE n)
@@ -228,14 +224,12 @@ static VALUE libvirt_network_active_p(VALUE n)
                                          ruby_libvirt_connect_get(n),
                                          network_get(n));
 }
-#endif
 
-#if HAVE_VIRNETWORKISPERSISTENT
 /*
  * call-seq:
  *   net.persistent? -> [true|false]
  *
- * Call virNetworkIsPersistent[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsPersistent]
+ * Call virNetworkIsPersistent[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsPersistent]
  * to determine if this network is persistent.
  */
 static VALUE libvirt_network_persistent_p(VALUE n)
@@ -244,9 +238,7 @@ static VALUE libvirt_network_persistent_p(VALUE n)
                                          ruby_libvirt_connect_get(n),
                                          network_get(n));
 }
-#endif
 
-#if HAVE_VIRNETWORKGETDHCPLEASES
 struct leases_arg {
     virNetworkDHCPLeasePtr *leases;
     int nleases;
@@ -296,7 +288,7 @@ static VALUE leases_wrap(VALUE arg)
  * call-seq:
  *   net.dhcp_leases(mac=nil, flags=0) -> Hash
  *
- * Call virNetworkGetDHCPLeases[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLeases]
+ * Call virNetworkGetDHCPLeases[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLeases]
  * to retrieve the leases for this network.
  */
 static VALUE libvirt_network_get_dhcp_leases(int argc, VALUE *argv, VALUE n)
@@ -330,24 +322,19 @@ static VALUE libvirt_network_get_dhcp_leases(int argc, VALUE *argv, VALUE n)
 
     return result;
 }
-#endif
-
-#endif
 
 /*
  * Class Libvirt::Network
  */
 void ruby_libvirt_network_init(void)
 {
-#if HAVE_TYPE_VIRNETWORKPTR
     c_network = rb_define_class_under(m_libvirt, "Network", rb_cObject);
     rb_define_attr(c_network, "connection", 1, 0);
 
     rb_define_method(c_network, "undefine", libvirt_network_undefine, 0);
     rb_define_method(c_network, "create", libvirt_network_create, 0);
-#if HAVE_VIRNETWORKUPDATE
     rb_define_method(c_network, "update", libvirt_network_update, 5);
-#endif
+
     rb_define_method(c_network, "destroy", libvirt_network_destroy, 0);
     rb_define_method(c_network, "name", libvirt_network_name, 0);
     rb_define_method(c_network, "uuid", libvirt_network_uuid, 0);
@@ -358,13 +345,8 @@ void ruby_libvirt_network_init(void)
     rb_define_method(c_network, "autostart=", libvirt_network_autostart_equal,
                      1);
     rb_define_method(c_network, "free", libvirt_network_free, 0);
-#if HAVE_VIRNETWORKISACTIVE
     rb_define_method(c_network, "active?", libvirt_network_active_p, 0);
-#endif
-#if HAVE_VIRNETWORKISPERSISTENT
     rb_define_method(c_network, "persistent?", libvirt_network_persistent_p, 0);
-#endif
-#if HAVE_CONST_VIR_NETWORK_UPDATE_COMMAND_NONE
     /* Ideally we would just have the "UPDATE_COMMAND_NONE" constant.
      * Unfortunately we screwed up long ago, and we have to
      * leave "NETWORK_UPDATE_COMMAND_NONE" for backwards compatibility.
@@ -525,31 +507,18 @@ void ruby_libvirt_network_init(void)
                     INT2NUM(VIR_NETWORK_UPDATE_AFFECT_CONFIG));
     rb_define_const(c_network, "NETWORK_UPDATE_AFFECT_CONFIG",
                     INT2NUM(VIR_NETWORK_UPDATE_AFFECT_CONFIG));
-#endif
 
-#if HAVE_CONST_VIR_NETWORK_XML_INACTIVE
     rb_define_const(c_network, "XML_INACTIVE",
                     INT2NUM(VIR_NETWORK_XML_INACTIVE));
-#endif
-#if HAVE_CONST_VIR_NETWORK_UPDATE_COMMAND_DELETE
     rb_define_const(c_network, "UPDATE_COMMAND_DELETE",
                     INT2NUM(VIR_NETWORK_UPDATE_COMMAND_DELETE));
-#endif
 
-#if HAVE_VIRNETWORKGETDHCPLEASES
     rb_define_method(c_network, "dhcp_leases",
                      libvirt_network_get_dhcp_leases, -1);
-#endif
 
-#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV4
     rb_define_const(c_network, "IP_ADDR_TYPE_IPV4",
                     INT2NUM(VIR_IP_ADDR_TYPE_IPV4));
-#endif
 
-#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV6
     rb_define_const(c_network, "IP_ADDR_TYPE_IPV6",
                     INT2NUM(VIR_IP_ADDR_TYPE_IPV6));
-#endif
-
-#endif
 }

data/ext/libvirt/nodedevice.c

@@ -26,7 +26,6 @@
 #include "connect.h"
 #include "extconf.h"
 
-#if HAVE_TYPE_VIRNODEDEVICEPTR
 static VALUE c_nodedevice;
 
 static void nodedevice_free(void *s)
@@ -48,7 +47,7 @@ VALUE ruby_libvirt_nodedevice_new(virNodeDevicePtr n, VALUE conn)
  * call-seq:
  *   nodedevice.name -> String
  *
- * Call virNodeDeviceGetName[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetName]
+ * Call virNodeDeviceGetName[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetName]
  * to retrieve the name of the node device.
  */
 static VALUE libvirt_nodedevice_name(VALUE c)
@@ -62,7 +61,7 @@ static VALUE libvirt_nodedevice_name(VALUE c)
  * call-seq:
  *   nodedevice.parent -> String
  *
- * Call virNodeDeviceGetParent[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetParent]
+ * Call virNodeDeviceGetParent[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetParent]
  * to retrieve the parent of the node device.
  */
 static VALUE libvirt_nodedevice_parent(VALUE c)
@@ -87,7 +86,7 @@ static VALUE libvirt_nodedevice_parent(VALUE c)
  * call-seq:
  *   nodedevice.num_of_caps -> Fixnum
  *
- * Call virNodeDeviceNumOfCaps[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceNumOfCaps]
+ * Call virNodeDeviceNumOfCaps[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceNumOfCaps]
  * to retrieve the number of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_num_of_caps(VALUE c)
@@ -101,7 +100,7 @@ static VALUE libvirt_nodedevice_num_of_caps(VALUE c)
  * call-seq:
  *   nodedevice.list_caps -> list
  *
- * Call virNodeDeviceListCaps[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceListCaps]
+ * Call virNodeDeviceListCaps[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceListCaps]
  * to retrieve a list of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_list_caps(VALUE c)
@@ -131,7 +130,7 @@ static VALUE libvirt_nodedevice_list_caps(VALUE c)
  * call-seq:
  *   nodedevice.xml_desc(flags=0) -> String
  *
- * Call virNodeDeviceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetXMLDesc]
+ * Call virNodeDeviceGetXMLDesc[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetXMLDesc]
  * to retrieve the XML for the node device.
  */
 static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE n)
@@ -150,7 +149,7 @@ static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   nodedevice.detach(driver=nil, flags=0) -> nil
  *
- * Call virNodeDeviceDettach[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDettach]
+ * Call virNodeDeviceDettach[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDettach]
  * to detach the node device from the node.
  */
 static VALUE libvirt_nodedevice_detach(int argc, VALUE *argv, VALUE n)
@@ -159,32 +158,25 @@ static VALUE libvirt_nodedevice_detach(int argc, VALUE *argv, VALUE n)
 
     rb_scan_args(argc, argv, "02", &driver, &flags);
 
-#if HAVE_VIRNODEDEVICEDETACHFLAGS
-    ruby_libvirt_generate_call_nil(virNodeDeviceDetachFlags,
-                                   ruby_libvirt_connect_get(n),
-                                   nodedevice_get(n),
-                                   ruby_libvirt_get_cstring_or_null(driver),
-                                   ruby_libvirt_value_to_uint(flags));
-#else
-    if (ruby_libvirt_value_to_uint(flags) != 0) {
-        rb_raise(e_NoSupportError, "Non-zero flags not supported");
-    }
-
-    if (ruby_libvirt_get_cstring_or_null(driver) != NULL) {
-        rb_raise(e_NoSupportError, "Non-NULL driver not supported");
+    if (ruby_libvirt_value_to_uint(flags) != 0 ||
+        ruby_libvirt_get_cstring_or_null(driver) != NULL) {
+        ruby_libvirt_generate_call_nil(virNodeDeviceDetachFlags,
+                                       ruby_libvirt_connect_get(n),
+                                       nodedevice_get(n),
+                                       ruby_libvirt_get_cstring_or_null(driver),
+                                       ruby_libvirt_value_to_uint(flags));
+    } else {
+        ruby_libvirt_generate_call_nil(virNodeDeviceDettach,
+                                       ruby_libvirt_connect_get(n),
+                                       nodedevice_get(n));
     }
-
-    ruby_libvirt_generate_call_nil(virNodeDeviceDettach,
-                                   ruby_libvirt_connect_get(n),
-                                   nodedevice_get(n));
-#endif
 }
 
 /*
  * call-seq:
  *   nodedevice.reattach -> nil
  *
- * Call virNodeDeviceReAttach[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReAttach]
+ * Call virNodeDeviceReAttach[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReAttach]
  * to reattach the node device to the node.
  */
 static VALUE libvirt_nodedevice_reattach(VALUE n)
@@ -198,7 +190,7 @@ static VALUE libvirt_nodedevice_reattach(VALUE n)
  * call-seq:
  *   nodedevice.reset -> nil
  *
- * Call virNodeDeviceReset[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReset]
+ * Call virNodeDeviceReset[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReset]
  * to reset the node device.
  */
 static VALUE libvirt_nodedevice_reset(VALUE n)
@@ -208,12 +200,11 @@ static VALUE libvirt_nodedevice_reset(VALUE n)
                                    nodedevice_get(n));
 }
 
-#if HAVE_VIRNODEDEVICEDESTROY
 /*
  * call-seq:
  *   nodedevice.destroy -> nil
  *
- * Call virNodeDeviceDestroy[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDestroy]
+ * Call virNodeDeviceDestroy[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDestroy]
  * to shutdown the node device.
  */
 static VALUE libvirt_nodedevice_destroy(VALUE n)
@@ -222,13 +213,12 @@ static VALUE libvirt_nodedevice_destroy(VALUE n)
                                    ruby_libvirt_connect_get(n),
                                    nodedevice_get(n));
 }
-#endif
 
 /*
  * call-seq:
  *   nodedevice.free -> nil
  *
- * Call virNodeDeviceFree[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceFree]
+ * Call virNodeDeviceFree[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceFree]
  * to free the node device object.  After this call the node device object is
  * no longer valid.
  */
@@ -237,12 +227,11 @@ static VALUE libvirt_nodedevice_free(VALUE n)
     ruby_libvirt_generate_call_free(NodeDevice, n);
 }
 
-#if HAVE_VIRNODEDEVICELOOKUPSCSIHOSTBYWWN
 /*
  * call-seq:
  *   nodedevice.lookup_scsi_host_by_wwn(wwnn, wwpn, flags=0) -> Libvirt::NodeDevice
  *
- * Call virNodeDeviceLookupSCSIHostByWWN[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceLookupSCSIHostByWWN]
+ * Call virNodeDeviceLookupSCSIHostByWWN[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceLookupSCSIHostByWWN]
  * to look up a SCSI host by its WWNN and WWPN.
  */
 static VALUE libvirt_nodedevice_lookup_scsi_host_by_wwn(int argc, VALUE *argv,
@@ -263,16 +252,13 @@ static VALUE libvirt_nodedevice_lookup_scsi_host_by_wwn(int argc, VALUE *argv,
 
     return ruby_libvirt_nodedevice_new(nd, ruby_libvirt_conn_attr(n));
 }
-#endif
 
-#endif
 
 /*
  * Class Libvirt::NodeDevice
  */
 void ruby_libvirt_nodedevice_init(void)
 {
-#if HAVE_TYPE_VIRNODEDEVICEPTR
     c_nodedevice = rb_define_class_under(m_libvirt, "NodeDevice", rb_cObject);
 
     rb_define_attr(c_nodedevice, "connection", 1, 0);
@@ -287,13 +273,8 @@ void ruby_libvirt_nodedevice_init(void)
     rb_define_method(c_nodedevice, "detach", libvirt_nodedevice_detach, -1);
     rb_define_method(c_nodedevice, "reattach", libvirt_nodedevice_reattach, 0);
     rb_define_method(c_nodedevice, "reset", libvirt_nodedevice_reset, 0);
-#if HAVE_VIRNODEDEVICEDESTROY
     rb_define_method(c_nodedevice, "destroy", libvirt_nodedevice_destroy, 0);
-#endif
     rb_define_method(c_nodedevice, "free", libvirt_nodedevice_free, 0);
-#if HAVE_VIRNODEDEVICELOOKUPSCSIHOSTBYWWN
     rb_define_method(c_nodedevice, "lookup_scsi_host_by_wwn",
                      libvirt_nodedevice_lookup_scsi_host_by_wwn, -1);
-#endif
-#endif
 }

data/ext/libvirt/nwfilter.c

@@ -26,7 +26,6 @@
 #include "connect.h"
 #include "extconf.h"
 
-#if HAVE_TYPE_VIRNWFILTERPTR
 static VALUE c_nwfilter;
 
 static void nwfilter_free(void *n)
@@ -48,7 +47,7 @@ VALUE ruby_libvirt_nwfilter_new(virNWFilterPtr n, VALUE conn)
  * call-seq:
  *   nwfilter.undefine -> nil
  *
- * Call virNWFilterUndefine[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterUndefine]
+ * Call virNWFilterUndefine[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterUndefine]
  * to undefine the network filter.
  */
 static VALUE libvirt_nwfilter_undefine(VALUE n)
@@ -62,7 +61,7 @@ static VALUE libvirt_nwfilter_undefine(VALUE n)
  * call-seq:
  *   nwfilter.name -> String
  *
- * Call virNWFilterGetName[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetName]
+ * Call virNWFilterGetName[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetName]
  * to retrieve the network filter name.
  */
 static VALUE libvirt_nwfilter_name(VALUE n)
@@ -76,7 +75,7 @@ static VALUE libvirt_nwfilter_name(VALUE n)
  * call-seq:
  *   nwfilter.uuid -> String
  *
- * Call virNWFilterGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetUUIDString]
+ * Call virNWFilterGetUUIDString[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetUUIDString]
  * to retrieve the network filter UUID.
  */
 static VALUE libvirt_nwfilter_uuid(VALUE n)
@@ -89,7 +88,7 @@ static VALUE libvirt_nwfilter_uuid(VALUE n)
  * call-seq:
  *   nwfilter.xml_desc(flags=0) -> String
  *
- * Call virNWFilterGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetXMLDesc]
+ * Call virNWFilterGetXMLDesc[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetXMLDesc]
  * to retrieve the XML for this network filter.
  */
 static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE n)
@@ -108,7 +107,7 @@ static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   nwfilter.free -> nil
  *
- * Call virNWFilterFree[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterFree]
+ * Call virNWFilterFree[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterFree]
  * to free this network filter.  After this call the network filter object is
  * no longer valid.
  */
@@ -117,14 +116,12 @@ static VALUE libvirt_nwfilter_free(VALUE n)
     ruby_libvirt_generate_call_free(NWFilter, n);
 }
 
-#endif
 
 /*
  * Class Libvirt::NWFilter
  */
 void ruby_libvirt_nwfilter_init(void)
 {
-#if HAVE_TYPE_VIRNWFILTERPTR
     c_nwfilter = rb_define_class_under(m_libvirt, "NWFilter", rb_cObject);
     rb_define_attr(c_nwfilter, "connection", 1, 0);
 
@@ -134,5 +131,4 @@ void ruby_libvirt_nwfilter_init(void)
     rb_define_method(c_nwfilter, "uuid", libvirt_nwfilter_uuid, 0);
     rb_define_method(c_nwfilter, "xml_desc", libvirt_nwfilter_xml_desc, -1);
     rb_define_method(c_nwfilter, "free", libvirt_nwfilter_free, 0);
-#endif
 }

data/ext/libvirt/secret.c

@@ -26,7 +26,6 @@
 #include "connect.h"
 #include "extconf.h"
 
-#if HAVE_TYPE_VIRSECRETPTR
 static VALUE c_secret;
 
 static void secret_free(void *s)
@@ -48,7 +47,7 @@ VALUE ruby_libvirt_secret_new(virSecretPtr s, VALUE conn)
  * call-seq:
  *   secret.uuid -> String
  *
- * Call virSecretGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUUIDString]
+ * Call virSecretGetUUIDString[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUUIDString]
  * to retrieve the UUID for this secret.
  */
 static VALUE libvirt_secret_uuid(VALUE s)
@@ -61,7 +60,7 @@ static VALUE libvirt_secret_uuid(VALUE s)
  * call-seq:
  *   secret.usagetype -> Fixnum
  *
- * Call virSecretGetUsageType[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageType]
+ * Call virSecretGetUsageType[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageType]
  * to retrieve the usagetype for this secret.
  */
 static VALUE libvirt_secret_usagetype(VALUE s)
@@ -75,7 +74,7 @@ static VALUE libvirt_secret_usagetype(VALUE s)
  * call-seq:
  *   secret.usageid -> String
  *
- * Call virSecretGetUsageID[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageID]
+ * Call virSecretGetUsageID[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageID]
  * to retrieve the usageid for this secret.
  */
 static VALUE libvirt_secret_usageid(VALUE s)
@@ -89,7 +88,7 @@ static VALUE libvirt_secret_usageid(VALUE s)
  * call-seq:
  *   secret.xml_desc(flags=0) -> String
  *
- * Call virSecretGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetXMLDesc]
+ * Call virSecretGetXMLDesc[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetXMLDesc]
  * to retrieve the XML for this secret.
  */
 static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s)
@@ -108,7 +107,7 @@ static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.set_value(value, flags=0) -> nil
  *
- * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
+ * Call virSecretSetValue[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
  * to set a new value in this secret.  Deprecated; use secret.value= instead.
  */
 static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s)
@@ -131,7 +130,7 @@ static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.value = value,flags=0
  *
- * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
+ * Call virSecretSetValue[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
  * to set a new value in this secret.
  */
 static VALUE libvirt_secret_value_equal(VALUE s, VALUE in)
@@ -168,7 +167,7 @@ static VALUE libvirt_secret_value_equal(VALUE s, VALUE in)
  * call-seq:
  *   secret.value(flags=0) -> String
  *
- * Call virSecretGetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetValue]
+ * Call virSecretGetValue[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetValue]
  * to retrieve the value from this secret.
  */
 static VALUE libvirt_secret_value(int argc, VALUE *argv, VALUE s)
@@ -203,7 +202,7 @@ static VALUE libvirt_secret_value(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.undefine -> nil
  *
- * Call virSecretUndefine[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretUndefine]
+ * Call virSecretUndefine[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretUndefine]
  * to undefine this secret.
  */
 static VALUE libvirt_secret_undefine(VALUE s)
@@ -217,7 +216,7 @@ static VALUE libvirt_secret_undefine(VALUE s)
  * call-seq:
  *   secret.free -> nil
  *
- * Call virSecretFree[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretFree]
+ * Call virSecretFree[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretFree]
  * to free this secret.  After this call the secret object is no longer valid.
  */
 static VALUE libvirt_secret_free(VALUE s)
@@ -225,14 +224,11 @@ static VALUE libvirt_secret_free(VALUE s)
     ruby_libvirt_generate_call_free(Secret, s);
 }
 
-#endif
-
 /*
  * Class Libvirt::Secret
  */
 void ruby_libvirt_secret_init(void)
 {
-#if HAVE_TYPE_VIRSECRETPTR
     c_secret = rb_define_class_under(m_libvirt, "Secret", rb_cObject);
 
     rb_define_attr(c_secret, "connection", 1, 0);
@@ -240,18 +236,12 @@ void ruby_libvirt_secret_init(void)
     rb_define_const(c_secret, "USAGE_TYPE_VOLUME",
                     INT2NUM(VIR_SECRET_USAGE_TYPE_VOLUME));
 
-#if HAVE_CONST_VIR_SECRET_USAGE_TYPE_CEPH
     rb_define_const(c_secret, "USAGE_TYPE_CEPH",
                     INT2NUM(VIR_SECRET_USAGE_TYPE_CEPH));
-#endif
-#if HAVE_CONST_VIR_SECRET_USAGE_TYPE_ISCSI
     rb_define_const(c_secret, "USAGE_TYPE_ISCSI",
                     INT2NUM(VIR_SECRET_USAGE_TYPE_ISCSI));
-#endif
-#if HAVE_CONST_VIR_SECRET_USAGE_TYPE_NONE
     rb_define_const(c_secret, "USAGE_TYPE_NONE",
                     INT2NUM(VIR_SECRET_USAGE_TYPE_NONE));
-#endif
 
     /* Secret object methods */
     rb_define_method(c_secret, "uuid", libvirt_secret_uuid, 0);
@@ -264,5 +254,4 @@ void ruby_libvirt_secret_init(void)
     rb_define_alias(c_secret, "get_value", "value");
     rb_define_method(c_secret, "undefine", libvirt_secret_undefine, 0);
     rb_define_method(c_secret, "free", libvirt_secret_free, 0);
-#endif
 }