ruby-libvirt 0.5.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fbcf087680f4524b1c5e1faba3dfad5bbc22f281
-  data.tar.gz: 298b6f117bd8b15acc809c70954b38341d7ace4c
+SHA256:
+  metadata.gz: ca7edd355f3679b48ebacb442e8d9c3d77af72a88681064e06a247ceabd4e391
+  data.tar.gz: dd4253fb78b7e584396aec931be145bc236db2e86a56eb275fe7c5675e7cd3f1
 SHA512:
-  metadata.gz: 9d8508cf6a4033efb7d0fb19451f19ed8efc79ebfd4ecfd6e601f7c1504d1007ce729da33245aab5d6563ae85e42cb98656f5b83091c049392af12f4d80eee4f
-  data.tar.gz: 0151aa217bfa464c7f08755b8d586e262b89ce196ac26c0024b0c8741cc1043a93c8ed70eb2ec082fd21dea3bdea5899cf5766c4ae86dbb478841bbe8c18c58a
+  metadata.gz: bf2f9cb3c62d5fb51e919eac7513603bbae31b23b7c712238fc98064c11563451963f5d6bdaa8e6c25f9680bdec14dcc651184d52001cb3d6c24a56134d7535f
+  data.tar.gz: 5561b660c8ec0ce8d61c363a6f1c467c3563277c55998661b75e24936fb6c11708e774a1aab859bfe48fc4f54c1864c371f620cb54bfabe9c9a2ae55d8d33c47

data/COPYING

@@ -3,7 +3,7 @@
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

data/NEWS

@@ -1,7 +1,43 @@
-2014-01-08
+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
+  * Fix up the tests for small semantic differences in how libvirt works
+
+2016-09-22 0.7.0
+  * Fix network lease API to allow arguments that libvirt allows
+  * Implement VIRT_STORAGE_POOL_CREATE flags
+  * Implement more VIR_STORAGE_VOL flags
+  * Implement VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN
+  * Implement virDomainDefineXMLFlags
+  * Implement virDomainRename
+  * Implement virDomainSetUserPassword
+  * Implement VIR_DOMAIN_TIME_SYNC
+  * Fix the return value from virStreamSourceFunc so volume upload works
+
+2015-11-20 0.6.0
+  * Fix possible buffer overflow
+  * Fix storage volume creation error messages
+  * Add additional storage pool defines
+  * Implement Network dhcp_leases method
+  * Implement Connect node_alloc_pages method
+  * Implement Domain time method
+  * Implement Connect domain_capabilities method
+  * Implement Domain core_dump_with_format method
+  * Implement Domain fs_freeze method
+  * Implement Domain fs_info method
+  * Implement Connect node_free_pages method
+
+2014-01-08 0.5.2
   * Fix to make sure we don't free more entires than retrieved
 
-2013-12-15
+2013-12-15 0.5.1
   * Fixes to compile against older libvirt
   * Fixes to compile against ruby 1.8
 

data/Rakefile

@@ -21,7 +21,7 @@ require 'rubygems/package_task'
 require 'rbconfig'
 
 PKG_NAME='ruby-libvirt'
-PKG_VERSION='0.5.2'
+PKG_VERSION='0.8.0'
 
 EXT_CONF='ext/libvirt/extconf.rb'
 MAKEFILE="ext/libvirt/Makefile"
@@ -37,8 +37,7 @@ LIBVIRT_SRC << MAKEFILE
 CLEAN.include [ "ext/**/*.o", LIBVIRT_MODULE, "ext/**/depend", "ext/**/*.gcda",
                 "ext/**/*.gcno", "ext/**/*.gcov" ]
 
-CLOBBER.include [ "config.save", "ext/**/mkmf.log", "ext/**/extconf.h",
-                  MAKEFILE ]
+CLOBBER.include [ "ext/**/mkmf.log", "ext/**/extconf.h", MAKEFILE ]
 
 task :default => :build
 
@@ -146,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

@@ -2,7 +2,7 @@
  * libvirt.c: Ruby bindings for libvirt
  *
  * Copyright (C) 2007,2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -60,7 +60,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.html#virGetVersion]
+ * Call virGetVersion[http://www.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 +90,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.html#virConnectOpen]
+ * Call virConnectOpen[http://www.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 +111,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.html#virConnectOpenReadOnly]
+ * Call virConnectOpenReadOnly[http://www.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,
@@ -184,7 +184,7 @@ 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.html#virConnectOpenAuth]
+ * Call virConnectOpenAuth[http://www.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;
@@ -575,7 +575,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.html#virEventRegisterImpl]
+ * Call virEventRegisterImpl[http://www.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
@@ -652,7 +652,7 @@ static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv,
  * call-seq:
  *   Libvirt::lxc_enter_security_label(model, label, flags=0) -> Libvirt::Domain::SecurityLabel
  *
- * Call virDomainLxcEnterSecurityLabel[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainLxcEnterSecurityLabel]
+ * Call virDomainLxcEnterSecurityLabel
  * to attach to the security label specified by label in the security model
  * specified by model.  The return object is a Libvirt::Domain::SecurityLabel
  * which may be able to be used to move back to the previous label.
@@ -660,7 +660,7 @@ static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv,
 static VALUE libvirt_domain_lxc_enter_security_label(int argc, VALUE *argv,
                                                      VALUE RUBY_LIBVIRT_UNUSED(c))
 {
-    VALUE model, label, flags, result, modiv, doiiv, labiv;
+    VALUE model = RUBY_Qnil, label = RUBY_Qnil, flags = RUBY_Qnil, result, modiv, doiiv, labiv;
     virSecurityModel mod;
     char *modstr, *doistr, *labstr;
     virSecurityLabel lab, oldlab;

data/ext/libvirt/common.c

@@ -2,7 +2,7 @@
  * common.c: Common utilities for the ruby libvirt bindings
  *
  * Copyright (C) 2007,2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -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)
@@ -84,6 +89,15 @@ VALUE ruby_libvirt_hash_aset_wrap(VALUE arg)
     return rb_hash_aset(e->hash, rb_str_new2(e->name), e->val);
 }
 
+VALUE ruby_libvirt_str_new2_and_ary_store_wrap(VALUE arg)
+{
+    struct ruby_libvirt_str_new2_and_ary_store_arg *e = (struct ruby_libvirt_str_new2_and_ary_store_arg *)arg;
+
+    rb_ary_store(e->arr, e->index, rb_str_new2(e->value));
+
+    return Qnil;
+}
+
 void ruby_libvirt_raise_error_if(const int condition, VALUE error,
                                  const char *method, virConnectPtr conn)
 {
@@ -135,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));
         }
     }
 
@@ -186,7 +200,7 @@ VALUE ruby_libvirt_generate_list(int num, char **list)
     VALUE result;
     int exception = 0;
     int i, j;
-    struct ruby_libvirt_ary_store_arg arg;
+    struct ruby_libvirt_str_new2_and_ary_store_arg arg;
 
     i = 0;
 
@@ -197,15 +211,13 @@ VALUE ruby_libvirt_generate_list(int num, char **list)
     for (i = 0; i < num; i++) {
         arg.arr = result;
         arg.index = i;
-        arg.elem = rb_protect(ruby_libvirt_str_new2_wrap, (VALUE)&(list[i]),
-                              &exception);
-        if (exception) {
-            goto exception;
-        }
-        rb_protect(ruby_libvirt_ary_store_wrap, (VALUE)&arg, &exception);
+        arg.value = list[i];
+        rb_protect(ruby_libvirt_str_new2_and_ary_store_wrap, (VALUE)&arg,
+                   &exception);
         if (exception) {
             goto exception;
         }
+
         xfree(list[i]);
     }
 
@@ -373,8 +385,10 @@ int ruby_libvirt_typed_parameter_assign(VALUE key, VALUE val, VALUE in)
             default:
                 rb_raise(rb_eArgError, "Invalid parameter type");
             }
+            /* ensure that the field is NULL-terminated */
+            args->params[args->i].field[VIR_TYPED_PARAM_FIELD_LENGTH - 1] = '\0';
             strncpy(args->params[args->i].field, keyname,
-                    VIR_TYPED_PARAM_FIELD_LENGTH);
+                    VIR_TYPED_PARAM_FIELD_LENGTH - 1);
             (args->i)++;
             found = 1;
             break;

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)
@@ -123,7 +123,7 @@ void ruby_libvirt_raise_error_if(const int condition, VALUE error,
 
 #define ruby_libvirt_generate_call_list_all(type, argc, argv, listfunc, object, val, newfunc, freefunc) \
     do {                                                                \
-        VALUE flags;                                                    \
+        VALUE flags = RUBY_Qnil;                                        \
         type *list;                                                     \
         int i;                                                          \
         int ret;                                                        \
@@ -232,11 +232,13 @@ unsigned long ruby_libvirt_value_to_ulong(VALUE in);
 unsigned long long ruby_libvirt_value_to_ulonglong(VALUE in);
 
 VALUE ruby_libvirt_ary_new2_wrap(VALUE arg);
+
 struct ruby_libvirt_ary_push_arg {
     VALUE arr;
     VALUE value;
 };
 VALUE ruby_libvirt_ary_push_wrap(VALUE arg);
+
 struct ruby_libvirt_ary_store_arg {
     VALUE arr;
     long index;
@@ -245,6 +247,7 @@ struct ruby_libvirt_ary_store_arg {
 VALUE ruby_libvirt_ary_store_wrap(VALUE arg);
 
 VALUE ruby_libvirt_str_new2_wrap(VALUE arg);
+
 struct ruby_libvirt_str_new_arg {
     char *val;
     size_t size;
@@ -258,6 +261,13 @@ struct ruby_libvirt_hash_aset_arg {
 };
 VALUE ruby_libvirt_hash_aset_wrap(VALUE arg);
 
+struct ruby_libvirt_str_new2_and_ary_store_arg {
+    VALUE arr;
+    long index;
+    char *value;
+};
+VALUE ruby_libvirt_str_new2_and_ary_store_wrap(VALUE arg);
+
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(ar) (RARRAY(ar)->len)
 #endif