ruby-libvirt 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 25025f1aa369d862c8fce5c8469309c19782309a
-  data.tar.gz: '090a8ccc0dd056d096fc1d450e38b07b0581f294'
+SHA256:
+  metadata.gz: fee786f1797ab1c5a5e8d496b387667786a5f703872a29125fbc0d43f6737b4b
+  data.tar.gz: e79852df639e0ff830afae0918e2e5e3754e555eb2db8c9641b38cb834793091
 SHA512:
-  metadata.gz: f88b82044556d2fb1940f56d009d605d00d4438db8443cedcda6febd32572b44073d03e3eda42c12916d4219c7a912b8eb0584fe79cfcaa5a6627c849d28c5ea
-  data.tar.gz: 6c9282d08593f50d8c45b92d401c4d6e98d0ae3915fe1678132985661b23c54c7d96bbe7f1af9b37c73e87c8f6652b310e798d6b5ff80b65509b691ec4b2fef6
+  metadata.gz: f927ee0ed89539c2db5ae8aa955d4e03960b770e511bec78b5e46972ccc61f8e3d6bcf1d5c34efa84b3573b9f55365bdb6be52534ad7e3777b6d6b926d5001da
+  data.tar.gz: 933864259c5b508f6956de0c5f99ba3a9ba3c741863e9f9e74fbe2d433f83e68fbf650725598f0c41c3df3c9abe51f3a717ccd27da547a57d359b86071379e03

data/NEWS

@@ -1,3 +1,16 @@
+2024-02-08 0.8.1
+  * Add missing virDomainUndefineFlagsValues constants
+  * Require libvirt 2.0.0
+  * Always use pkg-config for detecting libvirt
+  * Drop most compile-time feature checks
+
+2021-11-15 0.8.0
+  * Fix default values for node_cpu_stats and node_memory_stats
+  * Fix cpumap allocation for virDomainGetVcpus
+  * Enforce UTF8 for strings and exceptions
+  * Drop local have_const
+  * Use sensible default for libvirt_domain_qemu_agent_command
+
 2018-02-18 0.7.1
   * Fix a bad bug in block_resize (Marius Rieder)
   * Fix up some problems pointed out by clang

data/README

@@ -1,7 +1,7 @@
 ruby-libvirt
 ============
 
-Ruby bindings for libvirt (http://libvirt.org)
+Ruby bindings for libvirt (https://libvirt.org)
 
 Usage
 -----

data/README.rdoc

@@ -1,6 +1,6 @@
 = Ruby bindings for libvirt
 
-The module Libvirt provides bindings to libvirt[http://libvirt.org]
+The module Libvirt provides bindings to libvirt[https://libvirt.org]
 
 The various *Ptr types in Libvirt map loosely to the following Ruby classes:
 

data/Rakefile

@@ -21,7 +21,7 @@ require 'rubygems/package_task'
 require 'rbconfig'
 
 PKG_NAME='ruby-libvirt'
-PKG_VERSION='0.7.1'
+PKG_VERSION='0.8.1'
 
 EXT_CONF='ext/libvirt/extconf.rb'
 MAKEFILE="ext/libvirt/Makefile"
@@ -137,7 +137,7 @@ SPEC = Gem::Specification.new do |s|
     s.name = PKG_NAME
     s.version = PKG_VERSION
     s.email = "libvir-list@redhat.com"
-    s.homepage = "http://libvirt.org/ruby/"
+    s.homepage = "https://ruby.libvirt.org/"
     s.summary = "Ruby bindings for LIBVIRT"
     s.files = PKG_FILES
     s.required_ruby_version = '>= 1.8.1'
@@ -145,7 +145,7 @@ SPEC = Gem::Specification.new do |s|
     s.author = "David Lutterkort, Chris Lalancette"
     s.rubyforge_project = "None"
     s.description = "Ruby bindings for libvirt."
-    s.license = "LGPLv2"
+    s.license = "LGPL-2.1-or-later"
 end
 
 Gem::PackageTask.new(SPEC) do |pkg|

data/ext/libvirt/_libvirt.c

@@ -24,9 +24,7 @@
 #include <ruby.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
-#if HAVE_VIRDOMAINLXCENTERSECURITYLABEL
 #include <libvirt/libvirt-lxc.h>
-#endif
 #include "extconf.h"
 #include "common.h"
 #include "storage.h"
@@ -39,6 +37,10 @@
 #include "domain.h"
 #include "stream.h"
 
+#if !LIBVIR_CHECK_VERSION(2, 0, 0)
+# error "Libvirt >= 2.0.0 is required for the ruby binding"
+#endif
+
 static VALUE c_libvirt_version;
 
 VALUE m_libvirt;
@@ -60,7 +62,7 @@ static void rubyLibvirtErrorFunc(void *RUBY_LIBVIRT_UNUSED(userdata),
  * call-seq:
  *   Libvirt::version(type=nil) -> [ libvirt_version, type_version ]
  *
- * Call virGetVersion[http://www.libvirt.org/html/libvirt-libvirt-host.html#virGetVersion]
+ * Call virGetVersion[https://libvirt.org/html/libvirt-libvirt-host.html#virGetVersion]
  * to get the version of libvirt and of the hypervisor TYPE.
  */
 static VALUE libvirt_version(int argc, VALUE *argv,
@@ -90,7 +92,7 @@ static VALUE libvirt_version(int argc, VALUE *argv,
  * call-seq:
  *   Libvirt::open(uri=nil) -> Libvirt::Connect
  *
- * Call virConnectOpen[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectOpen]
+ * Call virConnectOpen[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectOpen]
  * to open a connection to a URL.
  */
 static VALUE libvirt_open(int argc, VALUE *argv, VALUE RUBY_LIBVIRT_UNUSED(m))
@@ -111,7 +113,7 @@ static VALUE libvirt_open(int argc, VALUE *argv, VALUE RUBY_LIBVIRT_UNUSED(m))
  * call-seq:
  *   Libvirt::open_read_only(uri=nil) -> Libvirt::Connect
  *
- * Call virConnectOpenReadOnly[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectOpenReadOnly]
+ * Call virConnectOpenReadOnly[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectOpenReadOnly]
  * to open a read-only connection to a URL.
  */
 static VALUE libvirt_open_read_only(int argc, VALUE *argv,
@@ -130,7 +132,6 @@ static VALUE libvirt_open_read_only(int argc, VALUE *argv,
     return ruby_libvirt_connect_new(conn);
 }
 
-#if HAVE_VIRCONNECTOPENAUTH
 static int libvirt_auth_callback_wrapper(virConnectCredentialPtr cred,
                                          unsigned int ncred, void *cbdata)
 {
@@ -184,11 +185,11 @@ static int libvirt_auth_callback_wrapper(virConnectCredentialPtr cred,
  * call-seq:
  *   Libvirt::open_auth(uri=nil, credlist=nil, userdata=nil, flags=0) {|...| authentication block} -> Libvirt::Connect
  *
- * Call virConnectOpenAuth[http://www.libvirt.org/html/libvirt-libvirt-host.html#virConnectOpenAuth]
+ * Call virConnectOpenAuth[https://libvirt.org/html/libvirt-libvirt-host.html#virConnectOpenAuth]
  * to open a connection to a libvirt URI, with a possible authentication block.
  * If an authentication block is desired, then credlist should be an array that
  * specifies which credentials the authentication block is willing to support;
- * the full list is available at http://libvirt.org/html/libvirt-libvirt.html#virConnectCredentialType.
+ * the full list is available at https://libvirt.org/html/libvirt-libvirt.html#virConnectCredentialType.
  * If userdata is not nil and an authentication block is given, userdata will
  * be passed unaltered into the authentication block.  The flags parameter
  * controls how to open connection.  The only options currently available for
@@ -262,9 +263,7 @@ static VALUE libvirt_open_auth(int argc, VALUE *argv,
 
     return ruby_libvirt_connect_new(conn);
 }
-#endif
 
-#if HAVE_VIREVENTREGISTERIMPL
 static VALUE add_handle, update_handle, remove_handle;
 static VALUE add_timeout, update_timeout, remove_timeout;
 
@@ -575,7 +574,7 @@ static int is_symbol_proc_or_nil(VALUE handle)
  * call-seq:
  *   Libvirt::event_register_impl(add_handle=nil, update_handle=nil, remove_handle=nil, add_timeout=nil, update_timeout=nil, remove_timeout=nil) -> Qnil
  *
- * Call virEventRegisterImpl[http://www.libvirt.org/html/libvirt-libvirt-event.html#virEventRegisterImpl]
+ * Call virEventRegisterImpl[https://libvirt.org/html/libvirt-libvirt-event.html#virEventRegisterImpl]
  * to register callback handlers for handles and timeouts.  These handles and
  * timeouts are used as part of the libvirt infrastructure for generating
  * domain events.  Each callback must be a Symbol (that is the name of a
@@ -645,9 +644,7 @@ static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv,
 
     return Qnil;
 }
-#endif
 
-#if HAVE_VIRDOMAINLXCENTERSECURITYLABEL
 /*
  * call-seq:
  *   Libvirt::lxc_enter_security_label(model, label, flags=0) -> Libvirt::Domain::SecurityLabel
@@ -701,7 +698,6 @@ static VALUE libvirt_domain_lxc_enter_security_label(int argc, VALUE *argv,
 
     return result;
 }
-#endif
 
 /*
  * Module Libvirt
@@ -712,7 +708,6 @@ void Init__libvirt(void)
     c_libvirt_version = rb_define_class_under(m_libvirt, "Version",
                                               rb_cObject);
 
-#if HAVE_VIRCONNECTOPENAUTH
     rb_define_const(m_libvirt, "CONNECT_RO", INT2NUM(VIR_CONNECT_RO));
 
     rb_define_const(m_libvirt, "CRED_USERNAME", INT2NUM(VIR_CRED_USERNAME));
@@ -725,12 +720,9 @@ void Init__libvirt(void)
                     INT2NUM(VIR_CRED_NOECHOPROMPT));
     rb_define_const(m_libvirt, "CRED_REALM", INT2NUM(VIR_CRED_REALM));
     rb_define_const(m_libvirt, "CRED_EXTERNAL", INT2NUM(VIR_CRED_EXTERNAL));
-#endif
 
-#if HAVE_CONST_VIR_CONNECT_NO_ALIASES
     rb_define_const(m_libvirt, "CONNECT_NO_ALIASES",
                     INT2NUM(VIR_CONNECT_NO_ALIASES));
-#endif
 
     /*
      * Libvirt Errors
@@ -768,82 +760,32 @@ void Init__libvirt(void)
     rb_define_const(e_Error, "FROM_TEST", INT2NUM(VIR_FROM_TEST));
     rb_define_const(e_Error, "FROM_REMOTE", INT2NUM(VIR_FROM_REMOTE));
     rb_define_const(e_Error, "FROM_OPENVZ", INT2NUM(VIR_FROM_OPENVZ));
-#if HAVE_CONST_VIR_FROM_VMWARE
     rb_define_const(e_Error, "FROM_VMWARE", INT2NUM(VIR_FROM_VMWARE));
-#endif
-#if HAVE_CONST_VIR_FROM_XENXM
     rb_define_const(e_Error, "FROM_XENXM", INT2NUM(VIR_FROM_XENXM));
-#endif
-#if HAVE_CONST_VIR_FROM_STATS_LINUX
     rb_define_const(e_Error, "FROM_STATS_LINUX", INT2NUM(VIR_FROM_STATS_LINUX));
-#endif
-#if HAVE_TYPE_VIR_FROM_LXC
     rb_define_const(e_Error, "FROM_LXC", INT2NUM(VIR_FROM_LXC));
-#endif
-#if HAVE_TYPE_VIRSTORAGEPOOLPTR
     rb_define_const(e_Error, "FROM_STORAGE", INT2NUM(VIR_FROM_STORAGE));
-#endif
-#if HAVE_CONST_VIR_FROM_NETWORK
     rb_define_const(e_Error, "FROM_NETWORK", INT2NUM(VIR_FROM_NETWORK));
-#endif
-#if HAVE_CONST_VIR_FROM_DOMAIN
     rb_define_const(e_Error, "FROM_DOMAIN", INT2NUM(VIR_FROM_DOMAIN));
-#endif
-#if HAVE_CONST_VIR_FROM_UML
     rb_define_const(e_Error, "FROM_UML", INT2NUM(VIR_FROM_UML));
-#endif
-#if HAVE_TYPE_VIRNODEDEVICEPTR
     rb_define_const(e_Error, "FROM_NODEDEV", INT2NUM(VIR_FROM_NODEDEV));
-#endif
-#if HAVE_CONST_VIR_FROM_XEN_INOTIFY
     rb_define_const(e_Error, "FROM_XEN_INOTIFY", INT2NUM(VIR_FROM_XEN_INOTIFY));
-#endif
-#if HAVE_CONST_VIR_FROM_SECURITY
     rb_define_const(e_Error, "FROM_SECURITY", INT2NUM(VIR_FROM_SECURITY));
-#endif
-#if HAVE_CONST_VIR_FROM_VBOX
     rb_define_const(e_Error, "FROM_VBOX", INT2NUM(VIR_FROM_VBOX));
-#endif
-#if HAVE_TYPE_VIRINTERFACEPTR
     rb_define_const(e_Error, "FROM_INTERFACE", INT2NUM(VIR_FROM_INTERFACE));
-#endif
-#if HAVE_CONST_VIR_FROM_ONE
     rb_define_const(e_Error, "FROM_ONE", INT2NUM(VIR_FROM_ONE));
-#endif
-#if HAVE_CONST_VIR_FROM_ESX
     rb_define_const(e_Error, "FROM_ESX", INT2NUM(VIR_FROM_ESX));
-#endif
-#if HAVE_CONST_VIR_FROM_PHYP
     rb_define_const(e_Error, "FROM_PHYP", INT2NUM(VIR_FROM_PHYP));
-#endif
-#if HAVE_TYPE_VIRSECRETPTR
     rb_define_const(e_Error, "FROM_SECRET", INT2NUM(VIR_FROM_SECRET));
-#endif
-#if HAVE_VIRCONNECTCOMPARECPU
     rb_define_const(e_Error, "FROM_CPU", INT2NUM(VIR_FROM_CPU));
-#endif
-#if HAVE_CONST_VIR_FROM_XENAPI
     rb_define_const(e_Error, "FROM_XENAPI", INT2NUM(VIR_FROM_XENAPI));
-#endif
-#if HAVE_TYPE_VIRNWFILTERPTR
     rb_define_const(e_Error, "FROM_NWFILTER", INT2NUM(VIR_FROM_NWFILTER));
-#endif
-#if HAVE_CONST_VIR_FROM_HOOK
     rb_define_const(e_Error, "FROM_HOOK", INT2NUM(VIR_FROM_HOOK));
-#endif
-#if HAVE_TYPE_VIRDOMAINSNAPSHOTPTR
     rb_define_const(e_Error, "FROM_DOMAIN_SNAPSHOT",
                     INT2NUM(VIR_FROM_DOMAIN_SNAPSHOT));
-#endif
-#if HAVE_CONST_VIR_FROM_AUDIT
     rb_define_const(e_Error, "FROM_AUDIT", INT2NUM(VIR_FROM_AUDIT));
-#endif
-#if HAVE_CONST_VIR_FROM_SYSINFO
     rb_define_const(e_Error, "FROM_SYSINFO", INT2NUM(VIR_FROM_SYSINFO));
-#endif
-#if HAVE_CONST_VIR_FROM_STREAMS
     rb_define_const(e_Error, "FROM_STREAMS", INT2NUM(VIR_FROM_STREAMS));
-#endif
 
     /* libvirt error codes */
     rb_define_const(e_Error, "ERR_OK", INT2NUM(VIR_ERR_OK));
@@ -897,10 +839,7 @@ void Init__libvirt(void)
     rb_define_const(e_Error, "ERR_NO_DOMAIN", INT2NUM(VIR_ERR_NO_DOMAIN));
     rb_define_const(e_Error, "ERR_NO_NETWORK", INT2NUM(VIR_ERR_NO_NETWORK));
     rb_define_const(e_Error, "ERR_INVALID_MAC", INT2NUM(VIR_ERR_INVALID_MAC));
-#if HAVE_CONST_VIR_ERR_AUTH_FAILED
     rb_define_const(e_Error, "ERR_AUTH_FAILED", INT2NUM(VIR_ERR_AUTH_FAILED));
-#endif
-#if HAVE_TYPE_VIRSTORAGEPOOLPTR
     rb_define_const(e_Error, "ERR_INVALID_STORAGE_POOL",
                     INT2NUM(VIR_ERR_INVALID_STORAGE_POOL));
     rb_define_const(e_Error, "ERR_INVALID_STORAGE_VOL",
@@ -910,66 +849,43 @@ void Init__libvirt(void)
                     INT2NUM(VIR_ERR_NO_STORAGE_POOL));
     rb_define_const(e_Error, "ERR_NO_STORAGE_VOL",
                     INT2NUM(VIR_ERR_NO_STORAGE_VOL));
-#endif
-#if HAVE_TYPE_VIRNODEDEVICEPTR
     rb_define_const(e_Error, "WAR_NO_NODE", INT2NUM(VIR_WAR_NO_NODE));
     rb_define_const(e_Error, "ERR_INVALID_NODE_DEVICE",
                     INT2NUM(VIR_ERR_INVALID_NODE_DEVICE));
     rb_define_const(e_Error, "ERR_NO_NODE_DEVICE",
                     INT2NUM(VIR_ERR_NO_NODE_DEVICE));
-#endif
-#if HAVE_CONST_VIR_ERR_NO_SECURITY_MODEL
     rb_define_const(e_Error, "ERR_NO_SECURITY_MODEL",
                     INT2NUM(VIR_ERR_NO_SECURITY_MODEL));
-#endif
-#if HAVE_CONST_VIR_ERR_OPERATION_INVALID
     rb_define_const(e_Error, "ERR_OPERATION_INVALID",
                     INT2NUM(VIR_ERR_OPERATION_INVALID));
-#endif
-#if HAVE_TYPE_VIRINTERFACEPTR
     rb_define_const(e_Error, "WAR_NO_INTERFACE", INT2NUM(VIR_WAR_NO_INTERFACE));
     rb_define_const(e_Error, "ERR_NO_INTERFACE", INT2NUM(VIR_ERR_NO_INTERFACE));
     rb_define_const(e_Error, "ERR_INVALID_INTERFACE",
                     INT2NUM(VIR_ERR_INVALID_INTERFACE));
     rb_define_const(e_Error, "ERR_MULTIPLE_INTERFACES",
                     INT2NUM(VIR_ERR_MULTIPLE_INTERFACES));
-#endif
-#if HAVE_TYPE_VIRNWFILTERPTR
     rb_define_const(e_Error, "WAR_NO_NWFILTER", INT2NUM(VIR_WAR_NO_NWFILTER));
     rb_define_const(e_Error, "ERR_INVALID_NWFILTER",
                     INT2NUM(VIR_ERR_INVALID_NWFILTER));
     rb_define_const(e_Error, "ERR_NO_NWFILTER", INT2NUM(VIR_ERR_NO_NWFILTER));
     rb_define_const(e_Error, "ERR_BUILD_FIREWALL",
                     INT2NUM(VIR_ERR_BUILD_FIREWALL));
-#endif
-#if HAVE_TYPE_VIRSECRETPTR
     rb_define_const(e_Error, "WAR_NO_SECRET", INT2NUM(VIR_WAR_NO_SECRET));
     rb_define_const(e_Error, "ERR_INVALID_SECRET",
                     INT2NUM(VIR_ERR_INVALID_SECRET));
     rb_define_const(e_Error, "ERR_NO_SECRET", INT2NUM(VIR_ERR_NO_SECRET));
-#endif
-#if HAVE_CONST_VIR_ERR_CONFIG_UNSUPPORTED
     rb_define_const(e_Error, "ERR_CONFIG_UNSUPPORTED",
                     INT2NUM(VIR_ERR_CONFIG_UNSUPPORTED));
-#endif
-#if HAVE_CONST_VIR_ERR_OPERATION_TIMEOUT
     rb_define_const(e_Error, "ERR_OPERATION_TIMEOUT",
                     INT2NUM(VIR_ERR_OPERATION_TIMEOUT));
-#endif
-#if HAVE_CONST_VIR_ERR_MIGRATE_PERSIST_FAILED
     rb_define_const(e_Error, "ERR_MIGRATE_PERSIST_FAILED",
                     INT2NUM(VIR_ERR_MIGRATE_PERSIST_FAILED));
-#endif
-#if HAVE_CONST_VIR_ERR_HOOK_SCRIPT_FAILED
     rb_define_const(e_Error, "ERR_HOOK_SCRIPT_FAILED",
                     INT2NUM(VIR_ERR_HOOK_SCRIPT_FAILED));
-#endif
-#if HAVE_TYPE_VIRDOMAINSNAPSHOTPTR
     rb_define_const(e_Error, "ERR_INVALID_DOMAIN_SNAPSHOT",
                     INT2NUM(VIR_ERR_INVALID_DOMAIN_SNAPSHOT));
     rb_define_const(e_Error, "ERR_NO_DOMAIN_SNAPSHOT",
                     INT2NUM(VIR_ERR_NO_DOMAIN_SNAPSHOT));
-#endif
 
     /* libvirt levels */
     rb_define_const(e_Error, "LEVEL_NONE", INT2NUM(VIR_ERR_NONE));
@@ -980,11 +896,8 @@ void Init__libvirt(void)
     rb_define_module_function(m_libvirt, "open", libvirt_open, -1);
     rb_define_module_function(m_libvirt, "open_read_only",
                               libvirt_open_read_only, -1);
-#if HAVE_VIRCONNECTOPENAUTH
     rb_define_module_function(m_libvirt, "open_auth", libvirt_open_auth, -1);
-#endif
 
-#if HAVE_VIREVENTREGISTERIMPL
     rb_define_const(m_libvirt, "EVENT_HANDLE_READABLE",
                     INT2NUM(VIR_EVENT_HANDLE_READABLE));
     rb_define_const(m_libvirt, "EVENT_HANDLE_WRITABLE",
@@ -1008,12 +921,9 @@ void Init__libvirt(void)
                               libvirt_event_invoke_handle_callback, 4);
     rb_define_module_function(m_libvirt, "event_invoke_timeout_callback",
                               libvirt_event_invoke_timeout_callback, 2);
-#endif
 
-#if HAVE_VIRDOMAINLXCENTERSECURITYLABEL
     rb_define_method(m_libvirt, "lxc_enter_security_label",
                      libvirt_domain_lxc_enter_security_label, -1);
-#endif
 
     ruby_libvirt_connect_init();
     ruby_libvirt_storage_init();

data/ext/libvirt/common.c

@@ -24,7 +24,8 @@
 #endif
 #include <stdio.h>
 #include <ruby.h>
-#include <st.h>
+#include <ruby/encoding.h>
+#include <ruby/st.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #include "common.h"
@@ -38,8 +39,9 @@ struct rb_exc_new2_arg {
 static VALUE ruby_libvirt_exc_new2_wrap(VALUE arg)
 {
     struct rb_exc_new2_arg *e = (struct rb_exc_new2_arg *)arg;
+    VALUE ruby_msg = ruby_libvirt_str_new2_wrap((VALUE)&e->msg);
 
-    return rb_exc_new2(e->error, e->msg);
+    return rb_exc_new3(e->error, ruby_msg);
 }
 
 VALUE ruby_libvirt_ary_new2_wrap(VALUE arg)
@@ -66,8 +68,11 @@ VALUE ruby_libvirt_ary_store_wrap(VALUE arg)
 VALUE ruby_libvirt_str_new2_wrap(VALUE arg)
 {
     char **str = (char **)arg;
+    VALUE ruby_msg = rb_str_new2(*str);
+    int enc = rb_enc_find_index("UTF-8");
 
-    return rb_str_new2(*str);
+    rb_enc_associate_index(ruby_msg, enc);
+    return ruby_msg;
 }
 
 VALUE ruby_libvirt_str_new_wrap(VALUE arg)
@@ -144,7 +149,7 @@ void ruby_libvirt_raise_error_if(const int condition, VALUE error,
         rb_iv_set(ruby_errinfo, "@libvirt_level", INT2NUM(err->level));
         if (err->message != NULL) {
             rb_iv_set(ruby_errinfo, "@libvirt_message",
-                      rb_str_new2(err->message));
+                      ruby_libvirt_str_new2_wrap((VALUE)&err->message));
         }
     }
 
@@ -475,9 +480,7 @@ int ruby_libvirt_get_maxcpus(virConnectPtr conn)
     int maxcpu = -1;
     virNodeInfo nodeinfo;
 
-#if HAVE_VIRNODEGETCPUMAP
     maxcpu = virNodeGetCPUMap(conn, NULL, NULL, 0);
-#endif
     if (maxcpu < 0) {
         /* fall back to nodeinfo */
         ruby_libvirt_raise_error_if(virNodeGetInfo(conn, &nodeinfo) < 0,

data/ext/libvirt/common.h

@@ -56,7 +56,7 @@ void ruby_libvirt_raise_error_if(const int condition, VALUE error,
             }                                                            \
         }                                                                \
         else {                                                           \
-            result = rb_str_new2(str);                                   \
+            result = ruby_libvirt_str_new2_wrap((VALUE)&str);            \
         }                                                                \
         return result;                                                   \
     } while(0)