ruby-libvirt 0.7.1 → 0.8.1

data/ext/libvirt/connect.c

@@ -21,9 +21,7 @@
 
 #include <ruby.h>
 #include <libvirt/libvirt.h>
-#if HAVE_VIRDOMAINQEMUATTACH
 #include <libvirt/libvirt-qemu.h>
-#endif
 #include <libvirt/virterror.h>
 #include "extconf.h"
 #include "common.h"
@@ -112,7 +110,7 @@ virConnectPtr ruby_libvirt_connect_get(VALUE c)
  * call-seq:
  *   conn.close -> nil
  *
- * Call virConnectClose[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectClose]
+ * Call virConnectClose[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectClose]
  * to close the connection.
  */
 static VALUE libvirt_connect_close(VALUE c)
@@ -145,7 +143,7 @@ static VALUE libvirt_connect_closed_p(VALUE c)
  * call-seq:
  *   conn.type -> String
  *
- * Call virConnectGetType[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetType]
+ * Call virConnectGetType[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetType]
  * to retrieve the type of hypervisor for this connection.
  */
 static VALUE libvirt_connect_type(VALUE c)
@@ -159,7 +157,7 @@ static VALUE libvirt_connect_type(VALUE c)
  * call-seq:
  *   conn.version -> Fixnum
  *
- * Call virConnectGetVersion[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetVersion]
+ * Call virConnectGetVersion[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetVersion]
  * to retrieve the version of the hypervisor for this connection.
  */
 static VALUE libvirt_connect_version(VALUE c)
@@ -174,12 +172,11 @@ static VALUE libvirt_connect_version(VALUE c)
     return ULONG2NUM(v);
 }
 
-#if HAVE_VIRCONNECTGETLIBVERSION
 /*
  * call-seq:
  *   conn.libversion -> Fixnum
  *
- * Call virConnectGetLibVersion[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetLibVersion]
+ * Call virConnectGetLibVersion[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetLibVersion]
  * to retrieve the version of the libvirt library for this connection.
  */
 static VALUE libvirt_connect_libversion(VALUE c)
@@ -194,13 +191,12 @@ static VALUE libvirt_connect_libversion(VALUE c)
 
     return ULONG2NUM(v);
 }
-#endif
 
 /*
  * call-seq:
  *   conn.hostname -> String
  *
- * Call virConnectGetHostname[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetHostname]
+ * Call virConnectGetHostname[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetHostname]
  * to retrieve the hostname of the hypervisor for this connection.
  */
 static VALUE libvirt_connect_hostname(VALUE c)
@@ -214,7 +210,7 @@ static VALUE libvirt_connect_hostname(VALUE c)
  * call-seq:
  *   conn.uri -> String
  *
- * Call virConnectGetURI[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetURI]
+ * Call virConnectGetURI[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetURI]
  * to retrieve the canonical URI for this connection.
  */
 static VALUE libvirt_connect_uri(VALUE c)
@@ -228,7 +224,7 @@ static VALUE libvirt_connect_uri(VALUE c)
  * call-seq:
  *   conn.max_vcpus(type=nil) -> Fixnum
  *
- * Call virConnectGetMaxVcpus[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetMaxVcpus]
+ * Call virConnectGetMaxVcpus[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetMaxVcpus]
  * to retrieve the maximum number of virtual cpus supported by the hypervisor
  * for this connection.
  */
@@ -248,7 +244,7 @@ static VALUE libvirt_connect_max_vcpus(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.node_info -> Libvirt::Connect::Nodeinfo
  *
- * Call virNodeGetInfo[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetInfo]
+ * Call virNodeGetInfo[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetInfo]
  * to retrieve information about the node for this connection.
  */
 static VALUE libvirt_connect_node_info(VALUE c)
@@ -278,7 +274,7 @@ static VALUE libvirt_connect_node_info(VALUE c)
  * call-seq:
  *   conn.node_free_memory -> Fixnum
  *
- * Call virNodeGetFreeMemory[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetFreeMemory]
+ * Call virNodeGetFreeMemory[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetFreeMemory]
  * to retrieve the amount of free memory available on the host for this
  * connection.
  */
@@ -299,7 +295,7 @@ static VALUE libvirt_connect_node_free_memory(VALUE c)
  * call-seq:
  *   conn.node_cells_free_memory(startCell=0, maxCells=#nodeCells) -> list
  *
- * Call virNodeGetCellsFreeMemory[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCellsFreeMemory]
+ * Call virNodeGetCellsFreeMemory[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCellsFreeMemory]
  * to retrieve the amount of free memory in each NUMA cell on the host for
  * this connection.
  */
@@ -347,12 +343,11 @@ static VALUE libvirt_connect_node_cells_free_memory(int argc, VALUE *argv,
     return cells;
 }
 
-#if HAVE_VIRNODEGETSECURITYMODEL
 /*
  * call-seq:
  *   conn.node_security_model -> Libvirt::Connect::NodeSecurityModel
  *
- * Call virNodeGetSecurityModel[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetSecurityModel]
+ * Call virNodeGetSecurityModel[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetSecurityModel]
  * to retrieve the security model in use on the host for this connection.
  */
 static VALUE libvirt_connect_node_security_model(VALUE c)
@@ -372,14 +367,12 @@ static VALUE libvirt_connect_node_security_model(VALUE c)
 
     return result;
 }
-#endif
 
-#if HAVE_VIRCONNECTISENCRYPTED
 /*
  * call-seq:
  *   conn.encrypted? -> [True|False]
  *
- * Call virConnectIsEncrypted[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectIsEncrypted]
+ * Call virConnectIsEncrypted[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectIsEncrypted]
  * to determine if the connection is encrypted.
  */
 static VALUE libvirt_connect_encrypted_p(VALUE c)
@@ -388,14 +381,12 @@ static VALUE libvirt_connect_encrypted_p(VALUE c)
                                          ruby_libvirt_connect_get(c),
                                          ruby_libvirt_connect_get(c));
 }
-#endif
 
-#if HAVE_VIRCONNECTISSECURE
 /*
  * call-seq:
  *   conn.secure? -> [True|False]
  *
- * Call virConnectIsSecure[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectIsSecure]
+ * Call virConnectIsSecure[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectIsSecure]
  * to determine if the connection is secure.
  */
 static VALUE libvirt_connect_secure_p(VALUE c)
@@ -404,13 +395,12 @@ static VALUE libvirt_connect_secure_p(VALUE c)
                                          ruby_libvirt_connect_get(c),
                                          ruby_libvirt_connect_get(c));
 }
-#endif
 
 /*
  * call-seq:
  *   conn.capabilities -> String
  *
- * Call virConnectGetCapabilities[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCapabilities]
+ * Call virConnectGetCapabilities[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCapabilities]
  * to retrieve the capabilities XML for this connection.
  */
 static VALUE libvirt_connect_capabilities(VALUE c)
@@ -420,12 +410,11 @@ static VALUE libvirt_connect_capabilities(VALUE c)
                                       ruby_libvirt_connect_get(c));
 }
 
-#if HAVE_VIRCONNECTCOMPARECPU
 /*
  * call-seq:
  *   conn.compare_cpu(xml, flags=0) -> compareflag
  *
- * Call virConnectCompareCPU[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectCompareCPU]
+ * Call virConnectCompareCPU[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectCompareCPU]
  * to compare the host CPU with the XML contained in xml.  Returns one of
  * Libvirt::CPU_COMPARE_ERROR, Libvirt::CPU_COMPARE_INCOMPATIBLE,
  * Libvirt::CPU_COMPARE_IDENTICAL, or Libvirt::CPU_COMPARE_SUPERSET.
@@ -442,15 +431,12 @@ static VALUE libvirt_connect_compare_cpu(int argc, VALUE *argv, VALUE c)
                                    StringValueCStr(xml),
                                    ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-
-#if HAVE_VIRCONNECTBASELINECPU
 /*
  * call-seq:
  *   conn.baseline_cpu([xml, xml2, ...], flags=0) -> XML
  *
- * Call virConnectBaselineCPU[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectBaselineCPU]
+ * Call virConnectBaselineCPU[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectBaselineCPU]
  * to compare the most feature-rich CPU which is compatible with all
  * given host CPUs.
  */
@@ -495,9 +481,7 @@ static VALUE libvirt_connect_baseline_cpu(int argc, VALUE *argv, VALUE c)
 
     return retval;
 }
-#endif
 
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTERANY || HAVE_VIRCONNECTDOMAINEVENTREGISTER
 static int domain_event_lifecycle_callback(virConnectPtr conn,
                                            virDomainPtr dom, int event,
                                            int detail, void *opaque)
@@ -533,9 +517,7 @@ static int domain_event_lifecycle_callback(virConnectPtr conn,
 
     return 0;
 }
-#endif
 
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTERANY
 static int domain_event_reboot_callback(virConnectPtr conn, virDomainPtr dom,
                                         void *opaque)
 {
@@ -788,7 +770,7 @@ static int domain_event_graphics_callback(virConnectPtr conn, virDomainPtr dom,
  * call-seq:
  *   conn.domain_event_register_any(eventID, callback, dom=nil, opaque=nil) -> Fixnum
  *
- * Call virConnectDomainEventRegisterAny[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventRegisterAny]
+ * Call virConnectDomainEventRegisterAny[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventRegisterAny]
  * to register callback for eventID with libvirt.  The eventID must be one of
  * the Libvirt::Connect::DOMAIN_EVENT_ID_* constants.  The callback can either
  * be a Symbol (that is the name of a method to callback) or a Proc.  Note that
@@ -873,7 +855,7 @@ static VALUE libvirt_connect_domain_event_register_any(int argc, VALUE *argv,
  * call-seq:
  *   conn.domain_event_deregister_any(callbackID) -> nil
  *
- * Call virConnectDomainEventDeregisterAny[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventDeregisterAny]
+ * Call virConnectDomainEventDeregisterAny[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventDeregisterAny]
  * to deregister a callback from libvirt.  The callbackID must be a
  * libvirt-specific handle returned by domain_event_register_any.
  */
@@ -885,9 +867,7 @@ static VALUE libvirt_connect_domain_event_deregister_any(VALUE c,
                                    ruby_libvirt_connect_get(c),
                                    NUM2INT(callbackID));
 }
-#endif
 
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTER
 /*
  * this is a bit of silliness.  Because libvirt internals track the address
  * of the function pointer, trying to use domain_event_lifecycle_callback
@@ -905,7 +885,7 @@ static int domain_event_callback(virConnectPtr conn,
  * call-seq:
  *   conn.domain_event_register(callback, opaque=nil) -> nil
  *
- * Call virConnectDomainEventRegister[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventRegister]
+ * Call virConnectDomainEventRegister[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventRegister]
  * to register callback for domain lifecycle events with libvirt.  The
  * callback can either be a Symbol (that is the name of a method to callback)
  * or a Proc.  The callback must accept 5 parameters: Libvirt::Connect,
@@ -941,7 +921,7 @@ static VALUE libvirt_connect_domain_event_register(int argc, VALUE *argv,
  * call-seq:
  *   conn.domain_event_deregister(callback) -> nil
  *
- * Call virConnectDomainEventDeregister[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventDeregister]
+ * Call virConnectDomainEventDeregister[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventDeregister]
  * to deregister the event callback from libvirt.  This method is deprecated
  * in favor of domain_event_deregister_any (though they cannot be mixed; if
  * the callback was registered with domain_event_register, it must be
@@ -954,13 +934,12 @@ static VALUE libvirt_connect_domain_event_deregister(VALUE c)
                                    ruby_libvirt_connect_get(c),
                                    domain_event_callback);
 }
-#endif
 
 /*
  * call-seq:
  *   conn.num_of_domains -> Fixnum
  *
- * Call virConnectNumOfDomains[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectNumOfDomains]
+ * Call virConnectNumOfDomains[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectNumOfDomains]
  * to retrieve the number of active domains on this connection.
  */
 static VALUE libvirt_connect_num_of_domains(VALUE c)
@@ -972,7 +951,7 @@ static VALUE libvirt_connect_num_of_domains(VALUE c)
  * call-seq:
  *   conn.list_domains -> list
  *
- * Call virConnectListDomains[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectListDomains]
+ * Call virConnectListDomains[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListDomains]
  * to retrieve a list of active domain IDs on this connection.
  */
 static VALUE libvirt_connect_list_domains(VALUE c)
@@ -1008,7 +987,7 @@ static VALUE libvirt_connect_list_domains(VALUE c)
  * call-seq:
  *   conn.num_of_defined_domains -> Fixnum
  *
- * Call virConnectNumOfDefinedDomains[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectNumOfDefinedDomains]
+ * Call virConnectNumOfDefinedDomains[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectNumOfDefinedDomains]
  * to retrieve the number of inactive domains on this connection.
  */
 static VALUE libvirt_connect_num_of_defined_domains(VALUE c)
@@ -1020,7 +999,7 @@ static VALUE libvirt_connect_num_of_defined_domains(VALUE c)
  * call-seq:
  *   conn.list_defined_domains -> list
  *
- * Call virConnectListDefinedDomains[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectListDefinedDomains]
+ * Call virConnectListDefinedDomains[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListDefinedDomains]
  * to retrieve a list of inactive domain names on this connection.
  */
 static VALUE libvirt_connect_list_defined_domains(VALUE c)
@@ -1032,7 +1011,7 @@ static VALUE libvirt_connect_list_defined_domains(VALUE c)
  * call-seq:
  *   conn.create_domain_linux(xml, flags=0) -> Libvirt::Domain
  *
- * Call virDomainCreateLinux[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateLinux]
+ * Call virDomainCreateLinux[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateLinux]
  * to start a transient domain from the given XML.  Deprecated; use
  * conn.create_domain_xml instead.
  */
@@ -1052,12 +1031,11 @@ static VALUE libvirt_connect_create_linux(int argc, VALUE *argv, VALUE c)
     return ruby_libvirt_domain_new(dom, c);
 }
 
-#if HAVE_VIRDOMAINCREATEXML
 /*
  * call-seq:
  *   conn.create_domain_xml(xml, flags=0) -> Libvirt::Domain
  *
- * Call virDomainCreateXML[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXML]
+ * Call virDomainCreateXML[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXML]
  * to start a transient domain from the given XML.
  */
 static VALUE libvirt_connect_create_domain_xml(int argc, VALUE *argv, VALUE c)
@@ -1074,13 +1052,12 @@ static VALUE libvirt_connect_create_domain_xml(int argc, VALUE *argv, VALUE c)
 
     return ruby_libvirt_domain_new(dom, c);
 }
-#endif
 
 /*
  * call-seq:
  *   conn.lookup_domain_by_name(name) -> Libvirt::Domain
  *
- * Call virDomainLookupByName[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByName]
+ * Call virDomainLookupByName[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByName]
  * to retrieve a domain object for name.
  */
 static VALUE libvirt_connect_lookup_domain_by_name(VALUE c, VALUE name)
@@ -1100,7 +1077,7 @@ static VALUE libvirt_connect_lookup_domain_by_name(VALUE c, VALUE name)
  * call-seq:
  *   conn.lookup_domain_by_id(id) -> Libvirt::Domain
  *
- * Call virDomainLookupByID[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByID]
+ * Call virDomainLookupByID[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByID]
  * to retrieve a domain object for id.
  */
 static VALUE libvirt_connect_lookup_domain_by_id(VALUE c, VALUE id)
@@ -1119,7 +1096,7 @@ static VALUE libvirt_connect_lookup_domain_by_id(VALUE c, VALUE id)
  * call-seq:
  *   conn.lookup_domain_by_uuid(uuid) -> Libvirt::Domain
  *
- * Call virDomainLookupByUUIDString[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByUUIDString]
+ * Call virDomainLookupByUUIDString[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByUUIDString]
  * to retrieve a domain object for uuid.
  */
 static VALUE libvirt_connect_lookup_domain_by_uuid(VALUE c, VALUE uuid)
@@ -1139,7 +1116,7 @@ static VALUE libvirt_connect_lookup_domain_by_uuid(VALUE c, VALUE uuid)
  * call-seq:
  *   conn.define_domain_xml(xml, flags=0) -> Libvirt::Domain
  *
- * Call virDomainDefineXML[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainDefineXML]
+ * Call virDomainDefineXML[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDefineXML]
  * to define a permanent domain on this connection.
  */
 static VALUE libvirt_connect_define_domain_xml(int argc, VALUE *argv, VALUE c)
@@ -1150,16 +1127,14 @@ static VALUE libvirt_connect_define_domain_xml(int argc, VALUE *argv, VALUE c)
 
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
-#if HAVE_VIRDOMAINDEFINEXMLFLAGS
-    dom = virDomainDefineXMLFlags(ruby_libvirt_connect_get(c),
-                                  StringValueCStr(xml),
-                                  ruby_libvirt_value_to_uint(flags));
-#else
     if (ruby_libvirt_value_to_uint(flags) != 0) {
-        rb_raise(e_NoSupportError, "Non-zero flags not supported");
+        dom = virDomainDefineXMLFlags(ruby_libvirt_connect_get(c),
+                                      StringValueCStr(xml),
+                                      ruby_libvirt_value_to_uint(flags));
+    } else {
+        dom = virDomainDefineXML(ruby_libvirt_connect_get(c),
+                                 StringValueCStr(xml));
     }
-    dom = virDomainDefineXML(ruby_libvirt_connect_get(c), StringValueCStr(xml));
-#endif
 
     ruby_libvirt_raise_error_if(dom == NULL, e_DefinitionError,
                                 "virDomainDefineXML",
@@ -1168,12 +1143,11 @@ static VALUE libvirt_connect_define_domain_xml(int argc, VALUE *argv, VALUE c)
     return ruby_libvirt_domain_new(dom, c);
 }
 
-#if HAVE_VIRCONNECTDOMAINXMLFROMNATIVE
 /*
  * call-seq:
  *   conn.domain_xml_from_native(nativeFormat, xml, flags=0) -> String
  *
- * Call virConnectDomainXMLFromNative[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainXMLFromNative]
+ * Call virConnectDomainXMLFromNative[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainXMLFromNative]
  * to convert a native hypervisor domain representation to libvirt XML.
  */
 static VALUE libvirt_connect_domain_xml_from_native(int argc, VALUE *argv,
@@ -1190,14 +1164,12 @@ static VALUE libvirt_connect_domain_xml_from_native(int argc, VALUE *argv,
                                       StringValueCStr(xml),
                                       ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_VIRCONNECTDOMAINXMLTONATIVE
 /*
  * call-seq:
  *   conn.domain_xml_to_native(nativeFormat, xml, flags=0) -> String
  *
- * Call virConnectDomainXMLToNative[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainXMLToNative]
+ * Call virConnectDomainXMLToNative[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainXMLToNative]
  * to convert libvirt XML to a native domain hypervisor representation.
  */
 static VALUE libvirt_connect_domain_xml_to_native(int argc, VALUE *argv,
@@ -1214,14 +1186,12 @@ static VALUE libvirt_connect_domain_xml_to_native(int argc, VALUE *argv,
                                       StringValueCStr(xml),
                                       ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_TYPE_VIRINTERFACEPTR
 /*
  * call-seq:
  *   conn.num_of_interfaces -> Fixnum
  *
- * Call virConnectNumOfInterfaces[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virConnectNumOfInterfaces]
+ * Call virConnectNumOfInterfaces[https://libvirt.org/html/libvirt-libvirt-interface.html#virConnectNumOfInterfaces]
  * to retrieve the number of active interfaces on this connection.
  */
 static VALUE libvirt_connect_num_of_interfaces(VALUE c)
@@ -1233,7 +1203,7 @@ static VALUE libvirt_connect_num_of_interfaces(VALUE c)
  * call-seq:
  *   conn.list_interfaces -> list
  *
- * Call virConnectListInterfaces[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virConnectListInterfaces]
+ * Call virConnectListInterfaces[https://libvirt.org/html/libvirt-libvirt-interface.html#virConnectListInterfaces]
  * to retrieve a list of active interface names on this connection.
  */
 static VALUE libvirt_connect_list_interfaces(VALUE c)
@@ -1245,7 +1215,7 @@ static VALUE libvirt_connect_list_interfaces(VALUE c)
  * call-seq:
  *   conn.num_of_defined_interfaces -> Fixnum
  *
- * Call virConnectNumOfDefinedInterfaces[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virConnectNumOfDefinedInterfaces]
+ * Call virConnectNumOfDefinedInterfaces[https://libvirt.org/html/libvirt-libvirt-interface.html#virConnectNumOfDefinedInterfaces]
  * to retrieve the number of inactive interfaces on this connection.
  */
 static VALUE libvirt_connect_num_of_defined_interfaces(VALUE c)
@@ -1257,7 +1227,7 @@ static VALUE libvirt_connect_num_of_defined_interfaces(VALUE c)
  * call-seq:
  *   conn.list_defined_interfaces -> list
  *
- * Call virConnectListDefinedInterfaces[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virConnectListDefinedInterfaces]
+ * Call virConnectListDefinedInterfaces[https://libvirt.org/html/libvirt-libvirt-interface.html#virConnectListDefinedInterfaces]
  * to retrieve a list of inactive interface names on this connection.
  */
 static VALUE libvirt_connect_list_defined_interfaces(VALUE c)
@@ -1269,7 +1239,7 @@ static VALUE libvirt_connect_list_defined_interfaces(VALUE c)
  * call-seq:
  *   conn.lookup_interface_by_name(name) -> Libvirt::Interface
  *
- * Call virInterfaceLookupByName[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceLookupByName]
+ * Call virInterfaceLookupByName[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceLookupByName]
  * to retrieve an interface object by name.
  */
 static VALUE libvirt_connect_lookup_interface_by_name(VALUE c, VALUE name)
@@ -1289,7 +1259,7 @@ static VALUE libvirt_connect_lookup_interface_by_name(VALUE c, VALUE name)
  * call-seq:
  *   conn.lookup_interface_by_mac(mac) -> Libvirt::Interface
  *
- * Call virInterfaceLookupByMACString[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceLookupByMACString]
+ * Call virInterfaceLookupByMACString[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceLookupByMACString]
  * to retrieve an interface object by MAC address.
  */
 static VALUE libvirt_connect_lookup_interface_by_mac(VALUE c, VALUE mac)
@@ -1309,7 +1279,7 @@ static VALUE libvirt_connect_lookup_interface_by_mac(VALUE c, VALUE mac)
  * call-seq:
  *   conn.define_interface_xml(xml, flags=0) -> Libvirt::Interface
  *
- * Call virInterfaceDefineXML[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceDefineXML]
+ * Call virInterfaceDefineXML[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceDefineXML]
  * to define a new interface from xml.
  */
 static VALUE libvirt_connect_define_interface_xml(int argc, VALUE *argv,
@@ -1329,13 +1299,12 @@ static VALUE libvirt_connect_define_interface_xml(int argc, VALUE *argv,
 
     return ruby_libvirt_interface_new(iface, c);
 }
-#endif
 
 /*
  * call-seq:
  *   conn.num_of_networks -> Fixnum
  *
- * Call virConnectNumOfNetworks[http://www.libvirt.org/html/libvirt-libvirt-network.html#virConnectNumOfNetworks]
+ * Call virConnectNumOfNetworks[https://libvirt.org/html/libvirt-libvirt-network.html#virConnectNumOfNetworks]
  * to retrieve the number of active networks on this connection.
  */
 static VALUE libvirt_connect_num_of_networks(VALUE c)
@@ -1347,7 +1316,7 @@ static VALUE libvirt_connect_num_of_networks(VALUE c)
  * call-seq:
  *   conn.list_networks -> list
  *
- * Call virConnectListNetworks[http://www.libvirt.org/html/libvirt-libvirt-network.html#virConnectListNetworks]
+ * Call virConnectListNetworks[https://libvirt.org/html/libvirt-libvirt-network.html#virConnectListNetworks]
  * to retrieve a list of active network names on this connection.
  */
 static VALUE libvirt_connect_list_networks(VALUE c)
@@ -1359,7 +1328,7 @@ static VALUE libvirt_connect_list_networks(VALUE c)
  * call-seq:
  *   conn.num_of_defined_networks -> Fixnum
  *
- * Call virConnectNumOfDefinedNetworks[http://www.libvirt.org/html/libvirt-libvirt-network.html#virConnectNumOfDefinedNetworks]
+ * Call virConnectNumOfDefinedNetworks[https://libvirt.org/html/libvirt-libvirt-network.html#virConnectNumOfDefinedNetworks]
  * to retrieve the number of inactive networks on this connection.
  */
 static VALUE libvirt_connect_num_of_defined_networks(VALUE c)
@@ -1371,7 +1340,7 @@ static VALUE libvirt_connect_num_of_defined_networks(VALUE c)
  * call-seq:
  *   conn.list_of_defined_networks -> list
  *
- * Call virConnectListDefinedNetworks[http://www.libvirt.org/html/libvirt-libvirt-network.html#virConnectListDefinedNetworks]
+ * Call virConnectListDefinedNetworks[https://libvirt.org/html/libvirt-libvirt-network.html#virConnectListDefinedNetworks]
  * to retrieve a list of inactive network names on this connection.
  */
 static VALUE libvirt_connect_list_defined_networks(VALUE c)
@@ -1383,7 +1352,7 @@ static VALUE libvirt_connect_list_defined_networks(VALUE c)
  * call-seq:
  *   conn.lookup_network_by_name(name) -> Libvirt::Network
  *
- * Call virNetworkLookupByName[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkLookupByName]
+ * Call virNetworkLookupByName[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkLookupByName]
  * to retrieve a network object by name.
  */
 static VALUE libvirt_connect_lookup_network_by_name(VALUE c, VALUE name)
@@ -1403,7 +1372,7 @@ static VALUE libvirt_connect_lookup_network_by_name(VALUE c, VALUE name)
  * call-seq:
  *   conn.lookup_network_by_uuid(uuid) -> Libvirt::Network
  *
- * Call virNetworkLookupByUUIDString[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkLookupByUUIDString]
+ * Call virNetworkLookupByUUIDString[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkLookupByUUIDString]
  * to retrieve a network object by UUID.
  */
 static VALUE libvirt_connect_lookup_network_by_uuid(VALUE c, VALUE uuid)
@@ -1423,7 +1392,7 @@ static VALUE libvirt_connect_lookup_network_by_uuid(VALUE c, VALUE uuid)
  * call-seq:
  *   conn.create_network_xml(xml) -> Libvirt::Network
  *
- * Call virNetworkCreateXML[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkCreateXML]
+ * Call virNetworkCreateXML[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkCreateXML]
  * to start a new transient network from xml.
  */
 static VALUE libvirt_connect_create_network_xml(VALUE c, VALUE xml)
@@ -1442,7 +1411,7 @@ static VALUE libvirt_connect_create_network_xml(VALUE c, VALUE xml)
  * call-seq:
  *   conn.define_network_xml(xml) -> Libvirt::Network
  *
- * Call virNetworkDefineXML[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkDefineXML]
+ * Call virNetworkDefineXML[https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkDefineXML]
  * to define a new permanent network from xml.
  */
 static VALUE libvirt_connect_define_network_xml(VALUE c, VALUE xml)
@@ -1458,13 +1427,12 @@ static VALUE libvirt_connect_define_network_xml(VALUE c, VALUE xml)
     return ruby_libvirt_network_new(netw, c);
 }
 
-#if HAVE_TYPE_VIRNODEDEVICEPTR
 
 /*
  * call-seq:
  *   conn.num_of_nodedevices(cap=nil, flags=0) -> Fixnum
  *
- * Call virNodeNumOfDevices[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeNumOfDevices]
+ * Call virNodeNumOfDevices[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeNumOfDevices]
  * to retrieve the number of node devices on this connection.
  */
 static VALUE libvirt_connect_num_of_nodedevices(int argc, VALUE *argv, VALUE c)
@@ -1488,7 +1456,7 @@ static VALUE libvirt_connect_num_of_nodedevices(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.list_nodedevices(cap=nil, flags=0) -> list
  *
- * Call virNodeListDevices[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeListDevices]
+ * Call virNodeListDevices[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeListDevices]
  * to retrieve a list of node device names on this connection.
  */
 static VALUE libvirt_connect_list_nodedevices(int argc, VALUE *argv, VALUE c)
@@ -1529,7 +1497,7 @@ static VALUE libvirt_connect_list_nodedevices(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.lookup_nodedevice_by_name(name) -> Libvirt::NodeDevice
  *
- * Call virNodeDeviceLookupByName[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceLookupByName]
+ * Call virNodeDeviceLookupByName[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceLookupByName]
  * to retrieve a nodedevice object by name.
  */
 static VALUE libvirt_connect_lookup_nodedevice_by_name(VALUE c, VALUE name)
@@ -1546,12 +1514,11 @@ static VALUE libvirt_connect_lookup_nodedevice_by_name(VALUE c, VALUE name)
 
 }
 
-#if HAVE_VIRNODEDEVICECREATEXML
 /*
  * call-seq:
  *   conn.create_nodedevice_xml(xml, flags=0) -> Libvirt::NodeDevice
  *
- * Call virNodeDeviceCreateXML[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceCreateXML]
+ * Call virNodeDeviceCreateXML[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceCreateXML]
  * to create a new node device from xml.
  */
 static VALUE libvirt_connect_create_nodedevice_xml(int argc, VALUE *argv,
@@ -1571,16 +1538,13 @@ static VALUE libvirt_connect_create_nodedevice_xml(int argc, VALUE *argv,
 
     return ruby_libvirt_nodedevice_new(nodedev, c);
 }
-#endif
-#endif
 
-#if HAVE_TYPE_VIRNWFILTERPTR
 
 /*
  * call-seq:
  *   conn.num_of_nwfilters -> Fixnum
  *
- * Call virConnectNumOfNWFilters[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectNumOfNWFilters]
+ * Call virConnectNumOfNWFilters[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectNumOfNWFilters]
  * to retrieve the number of network filters on this connection.
  */
 static VALUE libvirt_connect_num_of_nwfilters(VALUE c)
@@ -1592,7 +1556,7 @@ static VALUE libvirt_connect_num_of_nwfilters(VALUE c)
  * call-seq:
  *   conn.list_nwfilters -> list
  *
- * Call virConnectListNWFilters[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectListNWFilters]
+ * Call virConnectListNWFilters[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectListNWFilters]
  * to retrieve a list of network filter names on this connection.
  */
 static VALUE libvirt_connect_list_nwfilters(VALUE c)
@@ -1604,7 +1568,7 @@ static VALUE libvirt_connect_list_nwfilters(VALUE c)
  * call-seq:
  *   conn.lookup_nwfilter_by_name(name) -> Libvirt::NWFilter
  *
- * Call virNWFilterLookupByName[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterLookupByName]
+ * Call virNWFilterLookupByName[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterLookupByName]
  * to retrieve a network filter object by name.
  */
 static VALUE libvirt_connect_lookup_nwfilter_by_name(VALUE c, VALUE name)
@@ -1624,7 +1588,7 @@ static VALUE libvirt_connect_lookup_nwfilter_by_name(VALUE c, VALUE name)
  * call-seq:
  *   conn.lookup_nwfilter_by_uuid(uuid) -> Libvirt::NWFilter
  *
- * Call virNWFilterLookupByUUIDString[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterLookupByUUIDString]
+ * Call virNWFilterLookupByUUIDString[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterLookupByUUIDString]
  * to retrieve a network filter object by UUID.
  */
 static VALUE libvirt_connect_lookup_nwfilter_by_uuid(VALUE c, VALUE uuid)
@@ -1644,7 +1608,7 @@ static VALUE libvirt_connect_lookup_nwfilter_by_uuid(VALUE c, VALUE uuid)
  * call-seq:
  *   conn.define_nwfilter_xml(xml) -> Libvirt::NWFilter
  *
- * Call virNWFilterDefineXML[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterDefineXML]
+ * Call virNWFilterDefineXML[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterDefineXML]
  * to define a new network filter from xml.
  */
 static VALUE libvirt_connect_define_nwfilter_xml(VALUE c, VALUE xml)
@@ -1659,15 +1623,13 @@ static VALUE libvirt_connect_define_nwfilter_xml(VALUE c, VALUE xml)
 
     return ruby_libvirt_nwfilter_new(nwfilter, c);
 }
-#endif
 
-#if HAVE_TYPE_VIRSECRETPTR
 
 /*
  * call-seq:
  *   conn.num_of_secrets -> Fixnum
  *
- * Call virConnectNumOfSecrets[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virConnectNumOfSecrets]
+ * Call virConnectNumOfSecrets[https://libvirt.org/html/libvirt-libvirt-secret.html#virConnectNumOfSecrets]
  * to retrieve the number of secrets on this connection.
  */
 static VALUE libvirt_connect_num_of_secrets(VALUE c)
@@ -1679,7 +1641,7 @@ static VALUE libvirt_connect_num_of_secrets(VALUE c)
  * call-seq:
  *   conn.list_secrets -> list
  *
- * Call virConnectListSecrets[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virConnectListSecrets]
+ * Call virConnectListSecrets[https://libvirt.org/html/libvirt-libvirt-secret.html#virConnectListSecrets]
  * to retrieve a list of secret UUIDs on this connection.
  */
 static VALUE libvirt_connect_list_secrets(VALUE c)
@@ -1691,7 +1653,7 @@ static VALUE libvirt_connect_list_secrets(VALUE c)
  * call-seq:
  *   conn.lookup_secret_by_uuid(uuid) -> Libvirt::Secret
  *
- * Call virSecretLookupByUUID[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretLookupByUUID]
+ * Call virSecretLookupByUUID[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretLookupByUUID]
  * to retrieve a network object from uuid.
  */
 static VALUE libvirt_connect_lookup_secret_by_uuid(VALUE c, VALUE uuid)
@@ -1711,7 +1673,7 @@ static VALUE libvirt_connect_lookup_secret_by_uuid(VALUE c, VALUE uuid)
  * call-seq:
  *   conn.lookup_secret_by_usage(usagetype, usageID) -> Libvirt::Secret
  *
- * Call virSecretLookupByUsage[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretLookupByUsage]
+ * Call virSecretLookupByUsage[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretLookupByUsage]
  * to retrieve a secret by usagetype.
  */
 static VALUE libvirt_connect_lookup_secret_by_usage(VALUE c, VALUE usagetype,
@@ -1733,7 +1695,7 @@ static VALUE libvirt_connect_lookup_secret_by_usage(VALUE c, VALUE usagetype,
  * call-seq:
  *   conn.define_secret_xml(xml, flags=0) -> Libvirt::Secret
  *
- * Call virSecretDefineXML[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretDefineXML]
+ * Call virSecretDefineXML[https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretDefineXML]
  * to define a new secret from xml.
  */
 static VALUE libvirt_connect_define_secret_xml(int argc, VALUE *argv, VALUE c)
@@ -1752,9 +1714,7 @@ static VALUE libvirt_connect_define_secret_xml(int argc, VALUE *argv, VALUE c)
 
     return ruby_libvirt_secret_new(secret, c);
 }
-#endif
 
-#if HAVE_TYPE_VIRSTORAGEPOOLPTR
 
 VALUE pool_new(virStoragePoolPtr n, VALUE conn);
 
@@ -1762,7 +1722,7 @@ VALUE pool_new(virStoragePoolPtr n, VALUE conn);
  * call-seq:
  *   conn.list_storage_pools -> list
  *
- * Call virConnectListStoragePools[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectListStoragePools]
+ * Call virConnectListStoragePools[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectListStoragePools]
  * to retrieve a list of active storage pool names on this connection.
  */
 static VALUE libvirt_connect_list_storage_pools(VALUE c)
@@ -1774,7 +1734,7 @@ static VALUE libvirt_connect_list_storage_pools(VALUE c)
  * call-seq:
  *   conn.num_of_storage_pools -> Fixnum
  *
- * Call virConnectNumOfStoragePools[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectNumOfStoragePools]
+ * Call virConnectNumOfStoragePools[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectNumOfStoragePools]
  * to retrieve the number of active storage pools on this connection.
  */
 static VALUE libvirt_connect_num_of_storage_pools(VALUE c)
@@ -1786,7 +1746,7 @@ static VALUE libvirt_connect_num_of_storage_pools(VALUE c)
  * call-seq:
  *   conn.list_defined_storage_pools -> list
  *
- * Call virConnectListDefinedStoragePools[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectListDefinedStoragePools]
+ * Call virConnectListDefinedStoragePools[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectListDefinedStoragePools]
  * to retrieve a list of inactive storage pool names on this connection.
  */
 static VALUE libvirt_connect_list_defined_storage_pools(VALUE c)
@@ -1798,7 +1758,7 @@ static VALUE libvirt_connect_list_defined_storage_pools(VALUE c)
  * call-seq:
  *   conn.num_of_defined_storage_pools -> Fixnum
  *
- * Call virConnectNumOfDefinedStoragePools[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectNumOfDefinedStoragePools]
+ * Call virConnectNumOfDefinedStoragePools[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectNumOfDefinedStoragePools]
  * to retrieve the number of inactive storage pools on this connection.
  */
 static VALUE libvirt_connect_num_of_defined_storage_pools(VALUE c)
@@ -1810,7 +1770,7 @@ static VALUE libvirt_connect_num_of_defined_storage_pools(VALUE c)
  * call-seq:
  *   conn.lookup_storage_pool_by_name(name) -> Libvirt::StoragePool
  *
- * Call virStoragePoolLookupByName[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolLookupByName]
+ * Call virStoragePoolLookupByName[https://libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolLookupByName]
  * to retrieve a storage pool object by name.
  */
 static VALUE libvirt_connect_lookup_pool_by_name(VALUE c, VALUE name)
@@ -1830,7 +1790,7 @@ static VALUE libvirt_connect_lookup_pool_by_name(VALUE c, VALUE name)
  * call-seq:
  *   conn.lookup_storage_pool_by_uuid(uuid) -> Libvirt::StoragePool
  *
- * Call virStoragePoolLookupByUUIDString[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolLookupByUUIDString]
+ * Call virStoragePoolLookupByUUIDString[https://libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolLookupByUUIDString]
  * to retrieve a storage pool object by uuid.
  */
 static VALUE libvirt_connect_lookup_pool_by_uuid(VALUE c, VALUE uuid)
@@ -1850,7 +1810,7 @@ static VALUE libvirt_connect_lookup_pool_by_uuid(VALUE c, VALUE uuid)
  * call-seq:
  *   conn.create_storage_pool_xml(xml, flags=0) -> Libvirt::StoragePool
  *
- * Call virStoragePoolCreateXML[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolCreateXML]
+ * Call virStoragePoolCreateXML[https://libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolCreateXML]
  * to start a new transient storage pool from xml.
  */
 static VALUE libvirt_connect_create_pool_xml(int argc, VALUE *argv, VALUE c)
@@ -1874,7 +1834,7 @@ static VALUE libvirt_connect_create_pool_xml(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.define_storage_pool_xml(xml, flags=0) -> Libvirt::StoragePool
  *
- * Call virStoragePoolDefineXML[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolDefineXML]
+ * Call virStoragePoolDefineXML[https://libvirt.org/html/libvirt-libvirt-storage.html#virStoragePoolDefineXML]
  * to define a permanent storage pool from xml.
  */
 static VALUE libvirt_connect_define_pool_xml(int argc, VALUE *argv, VALUE c)
@@ -1898,7 +1858,7 @@ static VALUE libvirt_connect_define_pool_xml(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.discover_storage_pool_sources(type, srcSpec=nil, flags=0) -> String
  *
- * Call virConnectFindStoragePoolSources[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectFindStoragePoolSources]
+ * Call virConnectFindStoragePoolSources[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectFindStoragePoolSources]
  * to find the storage pool sources corresponding to type.
  */
 static VALUE libvirt_connect_find_storage_pool_sources(int argc, VALUE *argv,
@@ -1915,14 +1875,12 @@ static VALUE libvirt_connect_find_storage_pool_sources(int argc, VALUE *argv,
                                       ruby_libvirt_get_cstring_or_null(srcSpec),
                                       ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_VIRCONNECTGETSYSINFO
 /*
  * call-seq:
  *   conn.sys_info(flags=0) -> String
  *
- * Call virConnectGetSysinfo[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetSysinfo]
+ * Call virConnectGetSysinfo[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetSysinfo]
  * to get machine-specific information about the hypervisor.  This may include
  * data such as the host UUID, the BIOS version, etc.
  */
@@ -1937,15 +1895,12 @@ static VALUE libvirt_connect_sys_info(int argc, VALUE *argv, VALUE c)
                                       ruby_libvirt_connect_get(c),
                                       ruby_libvirt_value_to_uint(flags));
 }
-#endif
-
-#if HAVE_TYPE_VIRSTREAMPTR
 
 /*
  * call-seq:
  *   conn.stream(flags=0) -> Libvirt::Stream
  *
- * Call virStreamNew[http://www.libvirt.org/html/libvirt-libvirt-stream.html#virStreamNew]
+ * Call virStreamNew[https://libvirt.org/html/libvirt-libvirt-stream.html#virStreamNew]
  * to create a new stream.
  */
 static VALUE libvirt_connect_stream(int argc, VALUE *argv, VALUE c)
@@ -1963,14 +1918,12 @@ static VALUE libvirt_connect_stream(int argc, VALUE *argv, VALUE c)
 
     return ruby_libvirt_stream_new(stream, c);
 }
-#endif
 
-#if HAVE_VIRINTERFACECHANGEBEGIN
 /*
  * call-seq:
  *   conn.interface_change_begin(flags=0) -> nil
  *
- * Call virInterfaceChangeBegin[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeBegin]
+ * Call virInterfaceChangeBegin[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeBegin]
  * to create a restore point for interface changes.  Once changes have been
  * made, conn.interface_change_commit can be used to commit the result or
  * conn.interface_change_rollback can be used to rollback to this restore point.
@@ -1992,7 +1945,7 @@ static VALUE libvirt_connect_interface_change_begin(int argc, VALUE *argv,
  * call-seq:
  *   conn.interface_change_commit(flags=0) -> nil
  *
- * Call virInterfaceChangeCommit[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeCommit]
+ * Call virInterfaceChangeCommit[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeCommit]
  * to commit the interface changes since the last conn.interface_change_begin.
  */
 static VALUE libvirt_connect_interface_change_commit(int argc, VALUE *argv,
@@ -2012,7 +1965,7 @@ static VALUE libvirt_connect_interface_change_commit(int argc, VALUE *argv,
  * call-seq:
  *   conn.interface_change_rollback(flags=0) -> nil
  *
- * Call virInterfaceChangeRollback[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeRollback]
+ * Call virInterfaceChangeRollback[https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceChangeRollback]
  * to rollback to the restore point saved by conn.interface_change_begin.
  */
 static VALUE libvirt_connect_interface_change_rollback(int argc, VALUE *argv,
@@ -2027,9 +1980,7 @@ static VALUE libvirt_connect_interface_change_rollback(int argc, VALUE *argv,
                                    ruby_libvirt_connect_get(c),
                                    ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_VIRNODEGETCPUSTATS
 static void cpu_stats_set(void *voidparams, int i, VALUE result)
 {
     virNodeCPUStatsPtr params = (virNodeCPUStatsPtr)voidparams;
@@ -2069,7 +2020,7 @@ static const char *cpu_stats_get(VALUE d, unsigned int flags, void *voidparams,
  * call-seq:
  *   conn.node_cpu_stats(cpuNum=-1, flags=0) -> Hash
  *
- * Call virNodeGetCPUStats[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCPUStats]
+ * Call virNodeGetCPUStats[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCPUStats]
  * to retrieve cpu statistics from the virtualization host.
  */
 static VALUE libvirt_connect_node_cpu_stats(int argc, VALUE *argv, VALUE c)
@@ -2079,16 +2030,19 @@ static VALUE libvirt_connect_node_cpu_stats(int argc, VALUE *argv, VALUE c)
 
     rb_scan_args(argc, argv, "02", &intparam, &flags);
 
-    tmp = ruby_libvirt_value_to_int(intparam);
+    if (NIL_P(intparam)) {
+        tmp = -1;
+    }
+    else {
+        tmp = ruby_libvirt_value_to_int(intparam);
+    }
 
     return ruby_libvirt_get_parameters(c, ruby_libvirt_value_to_uint(flags),
                                        (void *)&tmp, sizeof(virNodeCPUStats),
                                        cpu_stats_nparams, cpu_stats_get,
                                        cpu_stats_set);
 }
-#endif
 
-#if HAVE_VIRNODEGETMEMORYSTATS
 static void memory_stats_set(void *voidparams, int i, VALUE result)
 {
     virNodeMemoryStatsPtr params = (virNodeMemoryStatsPtr)voidparams;
@@ -2129,7 +2083,7 @@ static const char *memory_stats_get(VALUE d, unsigned int flags,
  * call-seq:
  *   conn.node_memory_stats(cellNum=-1, flags=0) -> Hash
  *
- * Call virNodeGetMemoryStats[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetMemoryStats]
+ * Call virNodeGetMemoryStats[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetMemoryStats]
  * to retrieve memory statistics from the virtualization host.
  */
 static VALUE libvirt_connect_node_memory_stats(int argc, VALUE *argv, VALUE c)
@@ -2139,21 +2093,24 @@ static VALUE libvirt_connect_node_memory_stats(int argc, VALUE *argv, VALUE c)
 
     rb_scan_args(argc, argv, "02", &intparam, &flags);
 
-    tmp = ruby_libvirt_value_to_int(intparam);
+    if (NIL_P(intparam)) {
+        tmp = -1;
+    }
+    else {
+        tmp = ruby_libvirt_value_to_int(intparam);
+    }
 
     return ruby_libvirt_get_parameters(c, ruby_libvirt_value_to_uint(flags),
                                        (void *)&tmp, sizeof(virNodeMemoryStats),
                                        memory_stats_nparams, memory_stats_get,
                                        memory_stats_set);
 }
-#endif
 
-#if HAVE_VIRDOMAINSAVEIMAGEGETXMLDESC
 /*
  * call-seq:
  *   conn.save_image_xml_desc(filename, flags=0) -> String
  *
- * Call virDomainSaveImageGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSaveImageGetXMLDesc]
+ * Call virDomainSaveImageGetXMLDesc[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSaveImageGetXMLDesc]
  * to get the XML corresponding to a save file.
  */
 static VALUE libvirt_connect_save_image_xml_desc(int argc, VALUE *argv, VALUE c)
@@ -2173,7 +2130,7 @@ static VALUE libvirt_connect_save_image_xml_desc(int argc, VALUE *argv, VALUE c)
  * call-seq:
  *   conn.define_save_image_xml(filename, newxml, flags=0) -> nil
  *
- * Call virDomainSaveImageDefineXML[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSaveImageDefineXML]
+ * Call virDomainSaveImageDefineXML[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSaveImageDefineXML]
  * to define new XML for a saved image.
  */
 static VALUE libvirt_connect_define_save_image_xml(int argc, VALUE *argv,
@@ -2190,14 +2147,12 @@ static VALUE libvirt_connect_define_save_image_xml(int argc, VALUE *argv,
                                    StringValueCStr(newxml),
                                    ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_VIRNODESUSPENDFORDURATION
 /*
  * call-seq:
  *   conn.node_suspend_for_duration(target, duration, flags=0) -> nil
  *
- * Call virNodeSuspendForDuration[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeSuspendForDuration]
+ * Call virNodeSuspendForDuration[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeSuspendForDuration]
  * to suspend the hypervisor for the specified duration.
  */
 static VALUE libvirt_connect_node_suspend_for_duration(int argc, VALUE *argv,
@@ -2213,9 +2168,7 @@ static VALUE libvirt_connect_node_suspend_for_duration(int argc, VALUE *argv,
                                    NUM2UINT(target), NUM2ULL(duration),
                                    ruby_libvirt_value_to_uint(flags));
 }
-#endif
 
-#if HAVE_VIRNODEGETMEMORYPARAMETERS
 static const char *node_memory_nparams(VALUE d, unsigned int flags,
                                        void *RUBY_LIBVIRT_UNUSED(opaque),
                                        int *nparams)
@@ -2256,7 +2209,7 @@ static const char *node_memory_set(VALUE d, unsigned int flags,
  * call-seq:
  *   conn.node_memory_parameters(flags=0) -> Hash
  *
- * Call virNodeGetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetMemoryParameters]
+ * Call virNodeGetMemoryParameters[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetMemoryParameters]
  * to get information about memory on the host node.
  */
 static VALUE libvirt_connect_node_memory_parameters(int argc, VALUE *argv,
@@ -2280,16 +2233,14 @@ static struct ruby_libvirt_typed_param memory_allowed[] = {
     {VIR_NODE_MEMORY_SHARED_PAGES_UNSHARED, VIR_TYPED_PARAM_ULLONG},
     {VIR_NODE_MEMORY_SHARED_PAGES_VOLATILE, VIR_TYPED_PARAM_ULLONG},
     {VIR_NODE_MEMORY_SHARED_FULL_SCANS, VIR_TYPED_PARAM_ULLONG},
-#if HAVE_CONST_VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES
     {VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES, VIR_TYPED_PARAM_UINT},
-#endif
 };
 
 /*
  * call-seq:
  *   conn.node_memory_parameters = Hash,flags=0
  *
- * Call virNodeSetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeSetMemoryParameters]
+ * Call virNodeSetMemoryParameters[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeSetMemoryParameters]
  * to set the memory parameters for this host node.
  */
 static VALUE libvirt_connect_node_memory_parameters_equal(VALUE c, VALUE input)
@@ -2303,9 +2254,7 @@ static VALUE libvirt_connect_node_memory_parameters_equal(VALUE c, VALUE input)
                                              ARRAY_SIZE(memory_allowed),
                                              node_memory_set);
 }
-#endif
 
-#if HAVE_VIRNODEGETCPUMAP
 struct cpu_map_field_to_value {
     VALUE result;
     int cpu;
@@ -2327,7 +2276,7 @@ static VALUE cpu_map_field_to_value(VALUE input)
  * call-seq:
  *   conn.node_cpu_map -> Hash
  *
- * Call virNodeGetCPUMap[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCPUMap]
+ * Call virNodeGetCPUMap[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetCPUMap]
  * to get a map of online host CPUs.
  */
 static VALUE libvirt_connect_node_cpu_map(int argc, VALUE *argv, VALUE c)
@@ -2362,14 +2311,12 @@ static VALUE libvirt_connect_node_cpu_map(int argc, VALUE *argv, VALUE c)
 
     return result;
 }
-#endif
 
-#if HAVE_VIRCONNECTSETKEEPALIVE
 /*
  * call-seq:
  *   conn.set_keepalive(interval, count) -> Fixnum
  *
- * Call virConnectSetKeepAlive[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectSetKeepAlive]
+ * Call virConnectSetKeepAlive[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectSetKeepAlive]
  * to start sending keepalive messages.  Deprecated; use conn.keepalive=
  * instead.
  */
@@ -2385,7 +2332,7 @@ static VALUE libvirt_connect_set_keepalive(VALUE c, VALUE interval, VALUE count)
  * call-seq:
  *   conn.keepalive = interval,count
  *
- * Call virConnectSetKeepAlive[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectSetKeepAlive]
+ * Call virConnectSetKeepAlive[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectSetKeepAlive]
  * to start sending keepalive messages.
  */
 static VALUE libvirt_connect_keepalive_equal(VALUE c, VALUE in)
@@ -2407,14 +2354,12 @@ static VALUE libvirt_connect_keepalive_equal(VALUE c, VALUE in)
                                    ruby_libvirt_connect_get(c),
                                    NUM2INT(interval), NUM2UINT(count));
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLDOMAINS
 /*
  * call-seq:
  *   conn.list_all_domains(flags=0) -> Array
  *
- * Call virConnectListAllDomains[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomains]
+ * Call virConnectListAllDomains[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomains]
  * to get an array of domain objects for all domains.
  */
 static VALUE libvirt_connect_list_all_domains(int argc, VALUE *argv, VALUE c)
@@ -2424,14 +2369,12 @@ static VALUE libvirt_connect_list_all_domains(int argc, VALUE *argv, VALUE c)
                                         ruby_libvirt_connect_get(c), c,
                                         ruby_libvirt_domain_new, virDomainFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLNETWORKS
 /*
  * call-seq:
  *   conn.list_all_networks(flags=0) -> Array
  *
- * Call virConnectListAllNetworks[http://www.libvirt.org/html/libvirt-libvirt-network.html#virConnectListAllNetworks]
+ * Call virConnectListAllNetworks[https://libvirt.org/html/libvirt-libvirt-network.html#virConnectListAllNetworks]
  * to get an array of network objects for all networks.
  */
 static VALUE libvirt_connect_list_all_networks(int argc, VALUE *argv, VALUE c)
@@ -2442,14 +2385,12 @@ static VALUE libvirt_connect_list_all_networks(int argc, VALUE *argv, VALUE c)
                                         ruby_libvirt_network_new,
                                         virNetworkFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLINTERFACES
 /*
  * call-seq:
  *   conn.list_all_interfaces(flags=0) -> Array
  *
- * Call virConnectListAllInterfaces[http://www.libvirt.org/html/libvirt-libvirt-interface.html#virConnectListAllInterfaces]
+ * Call virConnectListAllInterfaces[https://libvirt.org/html/libvirt-libvirt-interface.html#virConnectListAllInterfaces]
  * to get an array of interface objects for all interfaces.
  */
 static VALUE libvirt_connect_list_all_interfaces(int argc, VALUE *argv, VALUE c)
@@ -2460,14 +2401,12 @@ static VALUE libvirt_connect_list_all_interfaces(int argc, VALUE *argv, VALUE c)
                                         ruby_libvirt_interface_new,
                                         virInterfaceFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLSECRETS
 /*
  * call-seq:
  *   conn.list_all_secrets(flags=0) -> Array
  *
- * Call virConnectListAllSecrets[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virConnectListAllSecrets]
+ * Call virConnectListAllSecrets[https://libvirt.org/html/libvirt-libvirt-secret.html#virConnectListAllSecrets]
  * to get an array of secret objects for all secrets.
  */
 static VALUE libvirt_connect_list_all_secrets(int argc, VALUE *argv, VALUE c)
@@ -2477,14 +2416,12 @@ static VALUE libvirt_connect_list_all_secrets(int argc, VALUE *argv, VALUE c)
                                         ruby_libvirt_connect_get(c), c,
                                         ruby_libvirt_secret_new, virSecretFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLNODEDEVICES
 /*
  * call-seq:
  *   conn.list_all_nodedevices(flags=0) -> Array
  *
- * Call virConnectListAllNodeDevices[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virConnectListAllNodeDevices]
+ * Call virConnectListAllNodeDevices[https://libvirt.org/html/libvirt-libvirt-nodedev.html#virConnectListAllNodeDevices]
  * to get an array of nodedevice objects for all nodedevices.
  */
 static VALUE libvirt_connect_list_all_nodedevices(int argc, VALUE *argv,
@@ -2496,14 +2433,12 @@ static VALUE libvirt_connect_list_all_nodedevices(int argc, VALUE *argv,
                                         ruby_libvirt_nodedevice_new,
                                         virNodeDeviceFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLSTORAGEPOOLS
 /*
  * call-seq:
  *   conn.list_all_storage_pools(flags=0) -> Array
  *
- * Call virConnectListAllStoragePools[http://www.libvirt.org/html/libvirt-libvirt-storage.html#virConnectListAllStoragePools]
+ * Call virConnectListAllStoragePools[https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectListAllStoragePools]
  * to get an array of storage pool objects for all storage pools.
  */
 static VALUE libvirt_connect_list_all_storage_pools(int argc, VALUE *argv,
@@ -2514,14 +2449,12 @@ static VALUE libvirt_connect_list_all_storage_pools(int argc, VALUE *argv,
                                         ruby_libvirt_connect_get(c), c,
                                         pool_new, virStoragePoolFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTLISTALLNWFILTERS
 /*
  * call-seq:
  *   conn.list_all_nwfilters(flags=0) -> Array
  *
- * Call virConnectListAllNWFilters[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectListAllNWFilters]
+ * Call virConnectListAllNWFilters[https://libvirt.org/html/libvirt-libvirt-nwfilter.html#virConnectListAllNWFilters]
  * to get an array of nwfilters for all nwfilter objects.
  */
 static VALUE libvirt_connect_list_all_nwfilters(int argc, VALUE *argv, VALUE c)
@@ -2532,14 +2465,12 @@ static VALUE libvirt_connect_list_all_nwfilters(int argc, VALUE *argv, VALUE c)
                                         ruby_libvirt_nwfilter_new,
                                         virNWFilterFree);
 }
-#endif
 
-#if HAVE_VIRCONNECTISALIVE
 /*
  * call-seq:
  *   conn.alive? -> [True|False]
  *
- * Call virConnectIsAlive[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectIsAlive]
+ * Call virConnectIsAlive[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectIsAlive]
  * to determine if the connection is alive.
  */
 static VALUE libvirt_connect_alive_p(VALUE c)
@@ -2548,14 +2479,12 @@ static VALUE libvirt_connect_alive_p(VALUE c)
                                          ruby_libvirt_connect_get(c),
                                          ruby_libvirt_connect_get(c));
 }
-#endif
 
-#if HAVE_VIRDOMAINCREATEXMLWITHFILES
 /*
  * call-seq:
  *   conn.create_domain_xml_with_files(xml, fds=nil, flags=0) -> Libvirt::Domain
  *
- * Call virDomainCreateXMLWithFiles[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXMLWithFiles]
+ * Call virDomainCreateXMLWithFiles[https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXMLWithFiles]
  * to launch a new guest domain with a set of open file descriptors.
  */
 static VALUE libvirt_connect_create_domain_xml_with_files(int argc, VALUE *argv,
@@ -2595,9 +2524,7 @@ static VALUE libvirt_connect_create_domain_xml_with_files(int argc, VALUE *argv,
 
     return ruby_libvirt_domain_new(dom, c);
 }
-#endif
 
-#if HAVE_VIRDOMAINQEMUATTACH
 /*
  * call-seq:
  *   conn.qemu_attach(pid, flags=0) -> Libvirt::Domain
@@ -2619,14 +2546,12 @@ static VALUE libvirt_connect_qemu_attach(int argc, VALUE *argv, VALUE c)
 
     return ruby_libvirt_domain_new(dom, c);
 }
-#endif
 
-#if HAVE_VIRCONNECTGETCPUMODELNAMES
 /*
  * call-seq:
  *   conn.cpu_model_names(arch, flags=0) -> Array
  *
- * Call virConnectGetCPUModelNames[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCPUModelNames]
+ * Call virConnectGetCPUModelNames[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCPUModelNames]
  * to get an array of CPU model names.
  */
 static VALUE libvirt_connect_cpu_model_names(int argc, VALUE *argv, VALUE c)
@@ -2676,14 +2601,12 @@ error:
     rb_jump_tag(exception);
     return Qnil;
 }
-#endif
 
-#if HAVE_VIRNODEALLOCPAGES
 /*
  * call-seq:
  *   conn.node_alloc_pages(page_arr, cells=nil, flags=0) -> Fixnum
  *
- * Call virNodeAllocPages[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeAllocPages]
+ * Call virNodeAllocPages[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeAllocPages]
  * to reserve huge pages in the system pool.
  */
 static VALUE libvirt_connect_node_alloc_pages(int argc, VALUE *argv, VALUE c)
@@ -2742,14 +2665,12 @@ static VALUE libvirt_connect_node_alloc_pages(int argc, VALUE *argv, VALUE c)
 
     return INT2NUM(ret);
 }
-#endif
 
-#if HAVE_VIRCONNECTGETDOMAINCAPABILITIES
 /*
  * call-seq:
  *   conn.domain_capabilities(emulatorbin, arch, machine, virttype, flags=0) -> String
  *
- * Call virConnectGetDomainCapabilities[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetDomainCapabilities]
+ * Call virConnectGetDomainCapabilities[https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetDomainCapabilities]
  * to get the capabilities of the underlying emulator.
  */
 static VALUE libvirt_connect_domain_capabilities(int argc, VALUE *argv, VALUE c)
@@ -2768,14 +2689,12 @@ static VALUE libvirt_connect_domain_capabilities(int argc, VALUE *argv, VALUE c)
                                       ruby_libvirt_get_cstring_or_null(virttype),
                                       NUM2UINT(flags));
 }
-#endif
 
-#if HAVE_VIRNODEGETFREEPAGES
 /*
  * call-seq:
  *   conn.node_free_pages(pages, cells, flags=0) -> Hash
  *
- * Call virNodeGetFreePages[http://www.libvirt.org/html/libvirt-libvirt-host.html#virNodeGetFreePages]
+ * Call virNodeGetFreePages[https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetFreePages]
  * to query the host system on free pages of specified size.
  */
 static VALUE libvirt_connect_node_free_pages(int argc, VALUE *argv, VALUE c)
@@ -2815,7 +2734,6 @@ static VALUE libvirt_connect_node_free_pages(int argc, VALUE *argv, VALUE c)
 
     return result;
 }
-#endif
 
 /*
  * Class Libvirt::Connect
@@ -2850,9 +2768,7 @@ void ruby_libvirt_connect_init(void)
     rb_define_method(c_connect, "closed?", libvirt_connect_closed_p, 0);
     rb_define_method(c_connect, "type", libvirt_connect_type, 0);
     rb_define_method(c_connect, "version", libvirt_connect_version, 0);
-#if HAVE_VIRCONNECTGETLIBVERSION
     rb_define_method(c_connect, "libversion", libvirt_connect_libversion, 0);
-#endif
     rb_define_method(c_connect, "hostname", libvirt_connect_hostname, 0);
     rb_define_method(c_connect, "uri", libvirt_connect_uri, 0);
     rb_define_method(c_connect, "max_vcpus", libvirt_connect_max_vcpus, -1);
@@ -2862,22 +2778,15 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_node_free_memory, 0);
     rb_define_method(c_connect, "node_cells_free_memory",
                      libvirt_connect_node_cells_free_memory, -1);
-#if HAVE_VIRNODEGETSECURITYMODEL
     rb_define_method(c_connect, "node_security_model",
                      libvirt_connect_node_security_model, 0);
     rb_define_alias(c_connect, "node_get_security_model",
                     "node_security_model");
-#endif
-#if HAVE_VIRCONNECTISENCRYPTED
     rb_define_method(c_connect, "encrypted?", libvirt_connect_encrypted_p, 0);
-#endif
-#if HAVE_VIRCONNECTISSECURE
     rb_define_method(c_connect, "secure?", libvirt_connect_secure_p, 0);
-#endif
     rb_define_method(c_connect, "capabilities", libvirt_connect_capabilities,
                      0);
 
-#if HAVE_VIRCONNECTCOMPARECPU
     rb_define_const(c_connect, "CPU_COMPARE_ERROR",
                     INT2NUM(VIR_CPU_COMPARE_ERROR));
     rb_define_const(c_connect, "CPU_COMPARE_INCOMPATIBLE",
@@ -2888,32 +2797,15 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CPU_COMPARE_SUPERSET));
 
     rb_define_method(c_connect, "compare_cpu", libvirt_connect_compare_cpu, -1);
-#endif
 
-#if HAVE_CONST_VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE
     rb_define_const(c_connect, "COMPARE_CPU_FAIL_INCOMPATIBLE",
                     INT2NUM(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE));
-#endif
 
-#if HAVE_VIRCONNECTBASELINECPU
     rb_define_method(c_connect, "baseline_cpu", libvirt_connect_baseline_cpu,
                      -1);
-#endif
-#if HAVE_CONST_VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES
     rb_define_const(c_connect, "BASELINE_CPU_EXPAND_FEATURES",
                     INT2NUM(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES));
-#endif
-
-    /* In the libvirt development history, the events were
-     * first defined in commit 1509b8027fd0b73c30aeab443f81dd5a18d80544,
-     * then ADDED and REMOVED were renamed to DEFINED and UNDEFINED at
-     * the same time that the details were added
-     * (d3d54d2fc92e350f250eda26cee5d0342416a9cf).  What this means is that
-     * we have to check for HAVE_CONST_VIR_DOMAIN_EVENT_DEFINED and
-     * HAVE_CONST_VIR_DOMAIN_EVENT_STARTED to untangle these, and then we
-     * can make a decision for many of the events based on that.
-     */
-#if HAVE_CONST_VIR_DOMAIN_EVENT_DEFINED
+
     rb_define_const(c_connect, "DOMAIN_EVENT_DEFINED",
                     INT2NUM(VIR_DOMAIN_EVENT_DEFINED));
     rb_define_const(c_connect, "DOMAIN_EVENT_DEFINED_ADDED",
@@ -2950,8 +2842,6 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_DOMAIN_EVENT_STOPPED_SAVED));
     rb_define_const(c_connect, "DOMAIN_EVENT_STOPPED_FAILED",
                     INT2NUM(VIR_DOMAIN_EVENT_STOPPED_FAILED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_STARTED
     rb_define_const(c_connect, "DOMAIN_EVENT_STARTED",
                     INT2NUM(VIR_DOMAIN_EVENT_STARTED));
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED",
@@ -2960,20 +2850,14 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_DOMAIN_EVENT_RESUMED));
     rb_define_const(c_connect, "DOMAIN_EVENT_STOPPED",
                     INT2NUM(VIR_DOMAIN_EVENT_STOPPED));
-#endif
-#if HAVE_TYPE_VIRDOMAINSNAPSHOTPTR
     rb_define_const(c_connect, "DOMAIN_EVENT_STARTED_FROM_SNAPSHOT",
                     INT2NUM(VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT));
     rb_define_const(c_connect, "DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT",
                     INT2NUM(VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SUSPENDED_IOERROR
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED_IOERROR",
                     INT2NUM(VIR_DOMAIN_EVENT_SUSPENDED_IOERROR));
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED_WATCHDOG",
                     INT2NUM(VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_WATCHDOG
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_WATCHDOG",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_WATCHDOG));
     rb_define_const(c_connect, "DOMAIN_EVENT_WATCHDOG_NONE",
@@ -2988,8 +2872,6 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_DOMAIN_EVENT_WATCHDOG_SHUTDOWN));
     rb_define_const(c_connect, "DOMAIN_EVENT_WATCHDOG_DEBUG",
                     INT2NUM(VIR_DOMAIN_EVENT_WATCHDOG_DEBUG));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_IO_ERROR
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_IO_ERROR",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_IO_ERROR));
     rb_define_const(c_connect, "DOMAIN_EVENT_IO_ERROR_NONE",
@@ -2998,8 +2880,6 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_DOMAIN_EVENT_IO_ERROR_PAUSE));
     rb_define_const(c_connect, "DOMAIN_EVENT_IO_ERROR_REPORT",
                     INT2NUM(VIR_DOMAIN_EVENT_IO_ERROR_REPORT));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_GRAPHICS
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_GRAPHICS",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_GRAPHICS));
     rb_define_const(c_connect, "DOMAIN_EVENT_GRAPHICS_CONNECT",
@@ -3012,94 +2892,53 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_IPV4));
     rb_define_const(c_connect, "DOMAIN_EVENT_GRAPHICS_ADDRESS_IPV6",
                     INT2NUM(VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_IPV6));
-#endif
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTERANY
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_LIFECYCLE",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_LIFECYCLE));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_REBOOT
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_REBOOT",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_REBOOT));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_RTC_CHANGE
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_RTC_CHANGE",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_RTC_CHANGE));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_IO_ERROR_REASON",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON));
-#endif
 
-#if HAVE_CONST_VIR_DOMAIN_EVENT_ID_CONTROL_ERROR
     rb_define_const(c_connect, "DOMAIN_EVENT_ID_CONTROL_ERROR",
                     INT2NUM(VIR_DOMAIN_EVENT_ID_CONTROL_ERROR));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SHUTDOWN
     rb_define_const(c_connect, "DOMAIN_EVENT_SHUTDOWN",
                     INT2NUM(VIR_DOMAIN_EVENT_SHUTDOWN));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_PMSUSPENDED
     rb_define_const(c_connect, "DOMAIN_EVENT_PMSUSPENDED",
                     INT2NUM(VIR_DOMAIN_EVENT_PMSUSPENDED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_CRASHED
     rb_define_const(c_connect, "DOMAIN_EVENT_CRASHED",
                     INT2NUM(VIR_DOMAIN_EVENT_CRASHED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_STARTED_WAKEUP
     rb_define_const(c_connect, "DOMAIN_EVENT_STARTED_WAKEUP",
                     INT2NUM(VIR_DOMAIN_EVENT_STARTED_WAKEUP));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SUSPENDED_RESTORED
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED_RESTORED",
                     INT2NUM(VIR_DOMAIN_EVENT_SUSPENDED_RESTORED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT",
                     INT2NUM(VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR
     rb_define_const(c_connect, "DOMAIN_EVENT_SUSPENDED_API_ERROR",
                     INT2NUM(VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT
     rb_define_const(c_connect, "DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT",
                     INT2NUM(VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED
     rb_define_const(c_connect, "DOMAIN_EVENT_SHUTDOWN_FINISHED",
                     INT2NUM(VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY
     rb_define_const(c_connect, "DOMAIN_EVENT_PMSUSPENDED_MEMORY",
                     INT2NUM(VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_PMSUSPENDED_DISK
     rb_define_const(c_connect, "DOMAIN_EVENT_PMSUSPENDED_DISK",
                     INT2NUM(VIR_DOMAIN_EVENT_PMSUSPENDED_DISK));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_CRASHED_PANICKED
     rb_define_const(c_connect, "DOMAIN_EVENT_CRASHED_PANICKED",
                     INT2NUM(VIR_DOMAIN_EVENT_CRASHED_PANICKED));
-#endif
-#if HAVE_CONST_VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_UNIX
     rb_define_const(c_connect, "DOMAIN_EVENT_GRAPHICS_ADDRESS_UNIX",
                     INT2NUM(VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_UNIX));
-#endif
 
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTER
     rb_define_method(c_connect, "domain_event_register",
                      libvirt_connect_domain_event_register, -1);
     rb_define_method(c_connect, "domain_event_deregister",
                      libvirt_connect_domain_event_deregister, 0);
-#endif
 
-#if HAVE_VIRCONNECTDOMAINEVENTREGISTERANY
     rb_define_method(c_connect, "domain_event_register_any",
                      libvirt_connect_domain_event_register_any, -1);
     rb_define_method(c_connect, "domain_event_deregister_any",
                      libvirt_connect_domain_event_deregister_any, 1);
-#endif
 
     /* Domain creation/lookup */
     rb_define_method(c_connect, "num_of_domains",
@@ -3112,33 +2951,24 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_list_defined_domains, 0);
     rb_define_method(c_connect, "create_domain_linux",
                      libvirt_connect_create_linux, -1);
-#if HAVE_VIRDOMAINCREATEXML
     rb_define_method(c_connect, "create_domain_xml",
                      libvirt_connect_create_domain_xml, -1);
-#endif
     rb_define_method(c_connect, "lookup_domain_by_name",
                      libvirt_connect_lookup_domain_by_name, 1);
     rb_define_method(c_connect, "lookup_domain_by_id",
                      libvirt_connect_lookup_domain_by_id, 1);
     rb_define_method(c_connect, "lookup_domain_by_uuid",
                      libvirt_connect_lookup_domain_by_uuid, 1);
-#if HAVE_CONST_VIR_DOMAIN_DEFINE_VALIDATE
     rb_define_const(c_connect, "DOMAIN_DEFINE_VALIDATE",
                     INT2NUM(VIR_DOMAIN_DEFINE_VALIDATE));
-#endif
     rb_define_method(c_connect, "define_domain_xml",
                      libvirt_connect_define_domain_xml, -1);
 
-#if HAVE_VIRCONNECTDOMAINXMLFROMNATIVE
     rb_define_method(c_connect, "domain_xml_from_native",
                      libvirt_connect_domain_xml_from_native, -1);
-#endif
-#if HAVE_VIRCONNECTDOMAINXMLTONATIVE
     rb_define_method(c_connect, "domain_xml_to_native",
                      libvirt_connect_domain_xml_to_native, -1);
-#endif
 
-#if HAVE_TYPE_VIRINTERFACEPTR
     /* Interface lookup/creation methods */
     rb_define_method(c_connect, "num_of_interfaces",
                      libvirt_connect_num_of_interfaces, 0);
@@ -3154,7 +2984,6 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_lookup_interface_by_mac, 1);
     rb_define_method(c_connect, "define_interface_xml",
                      libvirt_connect_define_interface_xml, -1);
-#endif
 
     /* Network lookup/creation methods */
     rb_define_method(c_connect, "num_of_networks",
@@ -3175,20 +3004,15 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_define_network_xml, 1);
 
     /* Node device lookup/creation methods */
-#if HAVE_TYPE_VIRNODEDEVICEPTR
     rb_define_method(c_connect, "num_of_nodedevices",
                      libvirt_connect_num_of_nodedevices, -1);
     rb_define_method(c_connect, "list_nodedevices",
                      libvirt_connect_list_nodedevices, -1);
     rb_define_method(c_connect, "lookup_nodedevice_by_name",
                      libvirt_connect_lookup_nodedevice_by_name, 1);
-#if HAVE_VIRNODEDEVICECREATEXML
     rb_define_method(c_connect, "create_nodedevice_xml",
                      libvirt_connect_create_nodedevice_xml, -1);
-#endif
-#endif
 
-#if HAVE_TYPE_VIRNWFILTERPTR
     /* NWFilter lookup/creation methods */
     rb_define_method(c_connect, "num_of_nwfilters",
                      libvirt_connect_num_of_nwfilters, 0);
@@ -3200,9 +3024,7 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_lookup_nwfilter_by_uuid, 1);
     rb_define_method(c_connect, "define_nwfilter_xml",
                      libvirt_connect_define_nwfilter_xml, 1);
-#endif
 
-#if HAVE_TYPE_VIRSECRETPTR
     /* Secret lookup/creation methods */
     rb_define_method(c_connect, "num_of_secrets",
                      libvirt_connect_num_of_secrets, 0);
@@ -3214,9 +3036,7 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_lookup_secret_by_usage, 2);
     rb_define_method(c_connect, "define_secret_xml",
                      libvirt_connect_define_secret_xml, -1);
-#endif
 
-#if HAVE_TYPE_VIRSTORAGEPOOLPTR
     /* StoragePool lookup/creation methods */
     rb_define_method(c_connect, "num_of_storage_pools",
                      libvirt_connect_num_of_storage_pools, 0);
@@ -3236,49 +3056,31 @@ void ruby_libvirt_connect_init(void)
                      libvirt_connect_define_pool_xml, -1);
     rb_define_method(c_connect, "discover_storage_pool_sources",
                      libvirt_connect_find_storage_pool_sources, -1);
-#endif
 
-#if HAVE_VIRCONNECTGETSYSINFO
     rb_define_method(c_connect, "sys_info", libvirt_connect_sys_info, -1);
-#endif
-#if HAVE_TYPE_VIRSTREAMPTR
     rb_define_method(c_connect, "stream", libvirt_connect_stream, -1);
-#endif
 
-#if HAVE_VIRINTERFACECHANGEBEGIN
     rb_define_method(c_connect, "interface_change_begin",
                      libvirt_connect_interface_change_begin, -1);
     rb_define_method(c_connect, "interface_change_commit",
                      libvirt_connect_interface_change_commit, -1);
     rb_define_method(c_connect, "interface_change_rollback",
                      libvirt_connect_interface_change_rollback, -1);
-#endif
 
-#if HAVE_VIRNODEGETCPUSTATS
     rb_define_method(c_connect, "node_cpu_stats",
                      libvirt_connect_node_cpu_stats, -1);
-#endif
-#if HAVE_CONST_VIR_NODE_CPU_STATS_ALL_CPUS
     rb_define_const(c_connect, "NODE_CPU_STATS_ALL_CPUS",
                     INT2NUM(VIR_NODE_CPU_STATS_ALL_CPUS));
-#endif
-#if HAVE_VIRNODEGETMEMORYSTATS
     rb_define_method(c_connect, "node_memory_stats",
                      libvirt_connect_node_memory_stats, -1);
-#endif
-#if HAVE_CONST_VIR_NODE_MEMORY_STATS_ALL_CELLS
     rb_define_const(c_connect, "NODE_MEMORY_STATS_ALL_CELLS",
                     INT2NUM(VIR_NODE_MEMORY_STATS_ALL_CELLS));
-#endif
 
-#if HAVE_VIRDOMAINSAVEIMAGEGETXMLDESC
     rb_define_method(c_connect, "save_image_xml_desc",
                      libvirt_connect_save_image_xml_desc, -1);
     rb_define_method(c_connect, "define_save_image_xml",
                      libvirt_connect_define_save_image_xml, -1);
-#endif
 
-#if HAVE_VIRNODESUSPENDFORDURATION
     rb_define_const(c_connect, "NODE_SUSPEND_TARGET_MEM",
                     INT2NUM(VIR_NODE_SUSPEND_TARGET_MEM));
     rb_define_const(c_connect, "NODE_SUSPEND_TARGET_DISK",
@@ -3288,29 +3090,21 @@ void ruby_libvirt_connect_init(void)
 
     rb_define_method(c_connect, "node_suspend_for_duration",
                      libvirt_connect_node_suspend_for_duration, -1);
-#endif
 
-#if HAVE_VIRNODEGETMEMORYPARAMETERS
     rb_define_method(c_connect, "node_memory_parameters",
                      libvirt_connect_node_memory_parameters, -1);
     rb_define_method(c_connect, "node_memory_parameters=",
                      libvirt_connect_node_memory_parameters_equal, 1);
-#endif
 
-#if HAVE_VIRNODEGETCPUMAP
     rb_define_method(c_connect, "node_cpu_map",
                      libvirt_connect_node_cpu_map, -1);
     rb_define_alias(c_connect, "node_get_cpu_map", "node_cpu_map");
-#endif
 
-#if HAVE_VIRCONNECTSETKEEPALIVE
     rb_define_method(c_connect, "set_keepalive",
                      libvirt_connect_set_keepalive, 2);
     rb_define_method(c_connect, "keepalive=", libvirt_connect_keepalive_equal,
                      1);
-#endif
 
-#if HAVE_VIRCONNECTLISTALLDOMAINS
     rb_define_const(c_connect, "LIST_DOMAINS_ACTIVE",
                     INT2NUM(VIR_CONNECT_LIST_DOMAINS_ACTIVE));
     rb_define_const(c_connect, "LIST_DOMAINS_INACTIVE",
@@ -3341,8 +3135,7 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT));
     rb_define_method(c_connect, "list_all_domains",
                      libvirt_connect_list_all_domains, -1);
-#endif
-#if HAVE_VIRCONNECTLISTALLNETWORKS
+
     rb_define_const(c_connect, "LIST_NETWORKS_ACTIVE",
                     INT2NUM(VIR_CONNECT_LIST_NETWORKS_ACTIVE));
     rb_define_const(c_connect, "LIST_NETWORKS_INACTIVE",
@@ -3357,16 +3150,14 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART));
     rb_define_method(c_connect, "list_all_networks",
                      libvirt_connect_list_all_networks, -1);
-#endif
-#if HAVE_VIRCONNECTLISTALLINTERFACES
+
     rb_define_const(c_connect, "LIST_INTERFACES_INACTIVE",
                     INT2NUM(VIR_CONNECT_LIST_INTERFACES_INACTIVE));
     rb_define_const(c_connect, "LIST_INTERFACES_ACTIVE",
                     INT2NUM(VIR_CONNECT_LIST_INTERFACES_ACTIVE));
     rb_define_method(c_connect, "list_all_interfaces",
                      libvirt_connect_list_all_interfaces, -1);
-#endif
-#if HAVE_VIRCONNECTLISTALLSECRETS
+
     rb_define_const(c_connect, "LIST_SECRETS_EPHEMERAL",
                     INT2NUM(VIR_CONNECT_LIST_SECRETS_EPHEMERAL));
     rb_define_const(c_connect, "LIST_SECRETS_NO_EPHEMERAL",
@@ -3377,8 +3168,7 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CONNECT_LIST_SECRETS_NO_PRIVATE));
     rb_define_method(c_connect, "list_all_secrets",
                      libvirt_connect_list_all_secrets, -1);
-#endif
-#if HAVE_VIRCONNECTLISTALLNODEDEVICES
+
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_SYSTEM",
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM));
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_PCI_DEV",
@@ -3397,20 +3187,15 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI));
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_STORAGE",
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE));
-#if HAVE_CONST_VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_FC_HOST",
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST));
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_VPORTS",
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS));
-#endif
-#if HAVE_CONST_VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC
     rb_define_const(c_connect, "LIST_NODE_DEVICES_CAP_SCSI_GENERIC",
                     INT2NUM(VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC));
-#endif
     rb_define_method(c_connect, "list_all_nodedevices",
                      libvirt_connect_list_all_nodedevices, -1);
-#endif
-#if HAVE_VIRCONNECTLISTALLSTORAGEPOOLS
+
     rb_define_const(c_connect, "LIST_STORAGE_POOLS_INACTIVE",
                     INT2NUM(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE));
     rb_define_const(c_connect, "LIST_STORAGE_POOLS_ACTIVE",
@@ -3445,47 +3230,26 @@ void ruby_libvirt_connect_init(void)
                     INT2NUM(VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG));
     rb_define_method(c_connect, "list_all_storage_pools",
                      libvirt_connect_list_all_storage_pools, -1);
-#endif
-#if HAVE_CONST_VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER
     rb_define_const(c_connect, "LIST_STORAGE_POOLS_GLUSTER",
                     INT2NUM(VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER));
-#endif
-#if HAVE_CONST_VIR_CONNECT_LIST_STORAGE_POOLS_ZFS
     rb_define_const(c_connect, "LIST_STORAGE_POOLS_ZFS",
                     INT2NUM(VIR_CONNECT_LIST_STORAGE_POOLS_ZFS));
-#endif
-#if HAVE_VIRCONNECTLISTALLNWFILTERS
     rb_define_method(c_connect, "list_all_nwfilters",
                      libvirt_connect_list_all_nwfilters, -1);
-#endif
-#if HAVE_VIRCONNECTISALIVE
     rb_define_method(c_connect, "alive?", libvirt_connect_alive_p, 0);
-#endif
-#if HAVE_VIRDOMAINCREATEXMLWITHFILES
     rb_define_method(c_connect, "create_domain_xml_with_files",
                      libvirt_connect_create_domain_xml_with_files, -1);
-#endif
-#if HAVE_VIRDOMAINQEMUATTACH
     rb_define_method(c_connect, "qemu_attach", libvirt_connect_qemu_attach, -1);
-#endif
-#if HAVE_VIRCONNECTGETCPUMODELNAMES
     rb_define_method(c_connect, "cpu_model_names",
                      libvirt_connect_cpu_model_names, -1);
-#endif
-#if HAVE_VIRNODEALLOCPAGES
     rb_define_const(c_connect, "NODE_ALLOC_PAGES_ADD",
                     INT2NUM(VIR_NODE_ALLOC_PAGES_ADD));
     rb_define_const(c_connect, "NODE_ALLOC_PAGES_SET",
                     INT2NUM(VIR_NODE_ALLOC_PAGES_SET));
     rb_define_method(c_connect, "node_alloc_pages",
 		     libvirt_connect_node_alloc_pages, -1);
-#endif
-#if HAVE_VIRCONNECTGETDOMAINCAPABILITIES
     rb_define_method(c_connect, "domain_capabilities",
                      libvirt_connect_domain_capabilities, -1);
-#endif
-#if HAVE_VIRNODEGETFREEPAGES
     rb_define_method(c_connect, "node_free_pages",
                      libvirt_connect_node_free_pages, -1);
-#endif
 }