ruby-libvirt 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9298c7723ec78226f314dc726eba72b89a2aecbb
-  data.tar.gz: 7c34d1dfeafb9eebb3cc4543fc131bc240ae251b
+  metadata.gz: a3d8455cea04535a67a854a1668e65e697f8f5a9
+  data.tar.gz: d7f64cdb9354ca004ce37b6ca0a13b32e3d6f424
 SHA512:
-  metadata.gz: 07c97eb6629972c30f1e001cfce9ae92e720dc96c34d4f688e560276ab61adda14c6795e5585a552e07b24581d72144522f8f2db1744545295174301553c8c24
-  data.tar.gz: e6d8ff0575e44d17959b9ee81d7b9c908f0cfaf3e3e83bd857f2d1b2004040dd5a23f8d04c96a644e6c6075dd61baad3700c3280694c8e8b173f88840c2d3c8e
+  metadata.gz: 793d87e2aed2a20afa6de1ae61898c04875b0d4bcb706c5cdc53a73214ceba84019be1c4153f8a9a0e59b431fe5bf074927d51edbcdf7bbbfc9a6b28534ffe48
+  data.tar.gz: cffa8666d8784b85afcf6e4bfdf2cfb7fd90722bc789ba5a602a5d7fe4f15005fe309a44d193a1c4dcfe92db06c82df457c27589acb8a01035fa1d9ad9b91f82

data/NEWS

@@ -1,3 +1,7 @@
+2013-12-15
+  * Fixes to compile against older libvirt
+  * Fixes to compile against ruby 1.8
+
 2013-12-09 0.5.0
   * Updated Network class, implementing almost all libvirt APIs
   * Updated Domain class, implementing almost all libvirt APIs

data/Rakefile

@@ -11,13 +11,17 @@
 
 # Rakefile for ruby-rpm -*- ruby -*-
 require 'rake/clean'
-require 'rdoc/task'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 require 'rake/testtask'
 require 'rubygems/package_task'
 require 'rbconfig'
 
 PKG_NAME='ruby-libvirt'
-PKG_VERSION='0.5.0'
+PKG_VERSION='0.5.1'
 
 EXT_CONF='ext/libvirt/extconf.rb'
 MAKEFILE="ext/libvirt/Makefile"

data/ext/libvirt/_libvirt.c

@@ -51,7 +51,8 @@ VALUE e_Error;
 VALUE e_NoSupportError;
 
 /* custom error function to suppress libvirt printing to stderr */
-static void rubyLibvirtErrorFunc(void *userdata, virErrorPtr err)
+static void rubyLibvirtErrorFunc(void *RUBY_LIBVIRT_UNUSED(userdata),
+                                 virErrorPtr RUBY_LIBVIRT_UNUSED(err))
 {
 }
 
@@ -62,7 +63,8 @@ static void rubyLibvirtErrorFunc(void *userdata, virErrorPtr err)
  * Call virGetVersion[http://www.libvirt.org/html/libvirt-libvirt.html#virGetVersion]
  * to get the version of libvirt and of the hypervisor TYPE.
  */
-static VALUE libvirt_version(int argc, VALUE *argv, VALUE m)
+static VALUE libvirt_version(int argc, VALUE *argv,
+                             VALUE RUBY_LIBVIRT_UNUSED(m))
 {
     unsigned long libVer, typeVer;
     VALUE type, result, rargv[2];
@@ -91,7 +93,7 @@ static VALUE libvirt_version(int argc, VALUE *argv, VALUE m)
  * Call virConnectOpen[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectOpen]
  * to open a connection to a URL.
  */
-static VALUE libvirt_open(int argc, VALUE *argv, VALUE m)
+static VALUE libvirt_open(int argc, VALUE *argv, VALUE RUBY_LIBVIRT_UNUSED(m))
 {
     VALUE uri;
     virConnectPtr conn;
@@ -112,7 +114,8 @@ static VALUE libvirt_open(int argc, VALUE *argv, VALUE m)
  * Call virConnectOpenReadOnly[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectOpenReadOnly]
  * to open a read-only connection to a URL.
  */
-static VALUE libvirt_open_read_only(int argc, VALUE *argv, VALUE m)
+static VALUE libvirt_open_read_only(int argc, VALUE *argv,
+                                    VALUE RUBY_LIBVIRT_UNUSED(m))
 {
     VALUE uri;
     virConnectPtr conn;
@@ -132,7 +135,7 @@ static int libvirt_auth_callback_wrapper(virConnectCredentialPtr cred,
                                          unsigned int ncred, void *cbdata)
 {
     VALUE userdata, newcred, result;
-    int i;
+    unsigned int i;
 
     userdata = (VALUE)cbdata;
 
@@ -211,12 +214,13 @@ static int libvirt_auth_callback_wrapper(virConnectCredentialPtr cred,
  * The authentication block should return the result of collecting the
  * information; these results will then be sent to libvirt for authentication.
  */
-static VALUE libvirt_open_auth(int argc, VALUE *argv, VALUE m)
+static VALUE libvirt_open_auth(int argc, VALUE *argv,
+                               VALUE RUBY_LIBVIRT_UNUSED(m))
 {
     virConnectAuthPtr auth;
     VALUE uri, credlist, userdata, flags, tmp;
     virConnectPtr conn;
-    int i;
+    unsigned int i;
 
     rb_scan_args(argc, argv, "04", &uri, &credlist, &userdata, &flags);
 
@@ -287,9 +291,9 @@ static VALUE add_timeout, update_timeout, remove_timeout;
  *
  * opaque - the opaque data passed from libvirt during the Libvirt::event_register_impl add_handle callback.  To ensure proper operation this data must be passed through to event_invoke_handle_callback without modification.
  */
-static VALUE libvirt_event_invoke_handle_callback(VALUE m, VALUE handle,
-                                                  VALUE fd, VALUE events,
-                                                  VALUE opaque)
+static VALUE libvirt_event_invoke_handle_callback(VALUE RUBY_LIBVIRT_UNUSED(m),
+                                                  VALUE handle, VALUE fd,
+                                                  VALUE events, VALUE opaque)
 {
     virEventHandleCallback cb;
     void *op;
@@ -332,8 +336,8 @@ static VALUE libvirt_event_invoke_handle_callback(VALUE m, VALUE handle,
  *
  * opaque - the opaque data passed from libvirt during the Libvirt::event_register_impl add_handle callback.  To ensure proper operation this data must be passed through to event_invoke_handle_callback without modification.
  */
-static VALUE libvirt_event_invoke_timeout_callback(VALUE m, VALUE timer,
-                                                   VALUE opaque)
+static VALUE libvirt_event_invoke_timeout_callback(VALUE RUBY_LIBVIRT_UNUSED(m),
+                                                   VALUE timer, VALUE opaque)
 {
     virEventTimeoutCallback cb;
     void *op;
@@ -599,7 +603,8 @@ static int is_symbol_proc_or_nil(VALUE handle)
  * passed to the event_invoke_handle_callback and event_invoke_timeout_callback
  * module methods; see the documentation for those methods for more details.
  */
-static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv, VALUE c)
+static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv,
+                                              VALUE RUBY_LIBVIRT_UNUSED(c))
 {
     virEventAddHandleFunc add_handle_temp;
     virEventUpdateHandleFunc update_handle_temp;
@@ -653,7 +658,7 @@ static VALUE libvirt_conn_event_register_impl(int argc, VALUE *argv, VALUE c)
  * which may be able to be used to move back to the previous label.
  */
 static VALUE libvirt_domain_lxc_enter_security_label(int argc, VALUE *argv,
-                                                     VALUE c)
+                                                     VALUE RUBY_LIBVIRT_UNUSED(c))
 {
     VALUE model, label, flags, result, modiv, doiiv, labiv;
     virSecurityModel mod;

data/ext/libvirt/common.c

@@ -24,6 +24,7 @@
 #endif
 #include <stdio.h>
 #include <ruby.h>
+#include <st.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #include "common.h"
@@ -256,20 +257,22 @@ void ruby_libvirt_typed_params_to_hash(void *voidparams, int i, VALUE hash)
 
 VALUE ruby_libvirt_get_parameters(VALUE d, unsigned int flags, void *opaque,
                                   unsigned int typesize,
-                                  char *(*nparams_cb)(VALUE d,
-                                                      unsigned int flags,
-                                                      void *opaque,
-                                                      int *nparams),
-                                  char *(*get_cb)(VALUE d, unsigned int flags,
-                                                  void *voidparams,
-                                                  int *nparams, void *opaque),
+                                  const char *(*nparams_cb)(VALUE d,
+                                                            unsigned int flags,
+                                                            void *opaque,
+                                                            int *nparams),
+                                  const char *(*get_cb)(VALUE d,
+                                                        unsigned int flags,
+                                                        void *voidparams,
+                                                        int *nparams,
+                                                        void *opaque),
                                   void (*hash_set)(void *voidparams, int i,
                                                    VALUE result))
 {
     int nparams = 0;
     void *params;
     VALUE result;
-    char *errname;
+    const char *errname;
     int i;
 
     errname = nparams_cb(d, flags, opaque, &nparams);
@@ -297,15 +300,15 @@ VALUE ruby_libvirt_get_parameters(VALUE d, unsigned int flags, void *opaque,
 
 VALUE ruby_libvirt_get_typed_parameters(VALUE d, unsigned int flags,
                                         void *opaque,
-                                        char *(*nparams_cb)(VALUE d,
-                                                            unsigned int flags,
-                                                            void *opaque,
-                                                            int *nparams),
-                                        char *(*get_cb)(VALUE d,
-                                                        unsigned int flags,
-                                                        void *params,
-                                                        int *nparams,
-                                                        void *opaque))
+                                        const char *(*nparams_cb)(VALUE d,
+                                                                  unsigned int flags,
+                                                                  void *opaque,
+                                                                  int *nparams),
+                                        const char *(*get_cb)(VALUE d,
+                                                              unsigned int flags,
+                                                              void *params,
+                                                              int *nparams,
+                                                              void *opaque))
 {
     return ruby_libvirt_get_parameters(d, flags, opaque,
                                        sizeof(virTypedParameter), nparams_cb,
@@ -389,13 +392,13 @@ VALUE ruby_libvirt_set_typed_parameters(VALUE d, VALUE input,
                                         unsigned int flags, void *opaque,
                                         struct ruby_libvirt_typed_param *allowed,
                                         unsigned int num_allowed,
-                                        char *(*set_cb)(VALUE d,
-                                                        unsigned int flags,
-                                                        virTypedParameterPtr params,
-                                                        int nparams,
-                                                        void *opaque))
+                                        const char *(*set_cb)(VALUE d,
+                                                              unsigned int flags,
+                                                              virTypedParameterPtr params,
+                                                              int nparams,
+                                                              void *opaque))
 {
-    char *errname;
+    const char *errname;
     struct ruby_libvirt_parameter_assign_args args;
     unsigned long hashsize;
 

data/ext/libvirt/common.h

@@ -5,6 +5,8 @@
 VALUE ruby_libvirt_new_class(VALUE klass, void *ptr, VALUE conn,
                              RUBY_DATA_FUNC free_func);
 
+#define RUBY_LIBVIRT_UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+
 #define ruby_libvirt_get_struct(kind, v)                                \
     do {                                                                \
         vir##kind##Ptr ptr;                                             \
@@ -123,7 +125,7 @@ void ruby_libvirt_raise_error_if(const int condition, VALUE error,
     do {                                                                \
         VALUE flags;                                                    \
         type *list;                                                     \
-        size_t i;                                                       \
+        int i;                                                          \
         int ret;                                                        \
         VALUE result;                                                   \
         int exception = 0;                                              \
@@ -175,28 +177,30 @@ VALUE ruby_libvirt_generate_list(int num, char **list);
 
 VALUE ruby_libvirt_get_parameters(VALUE d, unsigned int flags, void *opaque,
                                   unsigned int typesize,
-                                  char *(*nparams_cb)(VALUE d,
-                                                      unsigned int flags,
-                                                      void *opaque,
-                                                      int *nparams),
-                                  char *(*get_cb)(VALUE d, unsigned int flags,
-                                                  void *voidparams,
-                                                  int *nparams, void *opaque),
-                                  void (*hash_set)(void *voidparams, int i,
-                                                   VALUE result));
-VALUE ruby_libvirt_get_typed_parameters(VALUE d, unsigned int flags,
-                                        void *opaque,
-                                        char *(*nparams_cb)(VALUE d,
+                                  const char *(*nparams_cb)(VALUE d,
                                                             unsigned int flags,
                                                             void *opaque,
                                                             int *nparams),
-                                        char *(*get_cb)(VALUE d,
+                                  const char *(*get_cb)(VALUE d,
                                                         unsigned int flags,
-                                                        void *params,
+                                                        void *voidparams,
                                                         int *nparams,
-                                                        void *opaque));
+                                                        void *opaque),
+                                  void (*hash_set)(void *voidparams, int i,
+                                                   VALUE result));
+VALUE ruby_libvirt_get_typed_parameters(VALUE d, unsigned int flags,
+                                        void *opaque,
+                                        const char *(*nparams_cb)(VALUE d,
+                                                                  unsigned int flags,
+                                                                  void *opaque,
+                                                                  int *nparams),
+                                        const char *(*get_cb)(VALUE d,
+                                                              unsigned int flags,
+                                                              void *params,
+                                                              int *nparams,
+                                                              void *opaque));
 struct ruby_libvirt_typed_param {
-    char *name;
+    const char *name;
     int type;
 };
 struct ruby_libvirt_parameter_assign_args {
@@ -211,11 +215,11 @@ VALUE ruby_libvirt_set_typed_parameters(VALUE d, VALUE input,
                                         unsigned int flags, void *opaque,
                                         struct ruby_libvirt_typed_param *allowed,
                                         unsigned int num_allowed,
-                                        char *(*set_cb)(VALUE d,
-                                                        unsigned int flags,
-                                                        virTypedParameterPtr params,
-                                                        int nparams,
-                                                        void *opaque));
+                                        const char *(*set_cb)(VALUE d,
+                                                              unsigned int flags,
+                                                              virTypedParameterPtr params,
+                                                              int nparams,
+                                                              void *opaque));
 
 int ruby_libvirt_get_maxcpus(virConnectPtr conn);
 
@@ -249,7 +253,7 @@ VALUE ruby_libvirt_str_new_wrap(VALUE arg);
 
 struct ruby_libvirt_hash_aset_arg {
     VALUE hash;
-    char *name;
+    const char *name;
     VALUE val;
 };
 VALUE ruby_libvirt_hash_aset_wrap(VALUE arg);

data/ext/libvirt/connect.c

@@ -460,7 +460,8 @@ static VALUE libvirt_connect_baseline_cpu(int argc, VALUE *argv, VALUE c)
     char *r;
     unsigned int ncpus;
     const char **xmllist;
-    int i, exception = 0;
+    int exception = 0;
+    unsigned int i;
 
     rb_scan_args(argc, argv, "11", &xmlcpus, &flags);
 
@@ -2023,8 +2024,8 @@ static void cpu_stats_set(void *voidparams, int i, VALUE result)
                  ULL2NUM(params[i].value));
 }
 
-static char *cpu_stats_nparams(VALUE d, unsigned int flags, void *opaque,
-                               int *nparams)
+static const char *cpu_stats_nparams(VALUE d, unsigned int flags, void *opaque,
+                                     int *nparams)
 {
     int intparam = *((int *)opaque);
 
@@ -2036,8 +2037,8 @@ static char *cpu_stats_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *cpu_stats_get(VALUE d, unsigned int flags, void *voidparams,
-                           int *nparams, void *opaque)
+static const char *cpu_stats_get(VALUE d, unsigned int flags, void *voidparams,
+                                 int *nparams, void *opaque)
 {
     int intparam = *((int *)opaque);
     virNodeCPUStatsPtr params = (virNodeCPUStatsPtr)voidparams;
@@ -2082,8 +2083,8 @@ static void memory_stats_set(void *voidparams, int i, VALUE result)
                  ULL2NUM(params[i].value));
 }
 
-static char *memory_stats_nparams(VALUE d, unsigned int flags, void *opaque,
-                                  int *nparams)
+static const char *memory_stats_nparams(VALUE d, unsigned int flags,
+                                        void *opaque, int *nparams)
 {
     int intparam = *((int *)opaque);
 
@@ -2095,8 +2096,9 @@ static char *memory_stats_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *memory_stats_get(VALUE d, unsigned int flags, void *voidparams,
-                              int *nparams, void *opaque)
+static const char *memory_stats_get(VALUE d, unsigned int flags,
+                                    void *voidparams, int *nparams,
+                                    void *opaque)
 {
     int intparam = *((int *)opaque);
     virNodeMemoryStatsPtr params = (virNodeMemoryStatsPtr)voidparams;
@@ -2200,8 +2202,9 @@ static VALUE libvirt_connect_node_suspend_for_duration(int argc, VALUE *argv,
 #endif
 
 #if HAVE_VIRNODEGETMEMORYPARAMETERS
-static char *node_memory_nparams(VALUE d, unsigned int flags, void *opaque,
-                                 int *nparams)
+static const char *node_memory_nparams(VALUE d, unsigned int flags,
+                                       void *RUBY_LIBVIRT_UNUSED(opaque),
+                                       int *nparams)
 {
     if (virNodeGetMemoryParameters(ruby_libvirt_connect_get(d), NULL, nparams,
                                    flags) < 0) {
@@ -2211,8 +2214,9 @@ static char *node_memory_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *node_memory_get(VALUE d, unsigned int flags, void *voidparams,
-                             int *nparams, void *opaque)
+static const char *node_memory_get(VALUE d, unsigned int flags,
+                                   void *voidparams, int *nparams,
+                                   void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
 
@@ -2223,9 +2227,9 @@ static char *node_memory_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *node_memory_set(VALUE d, unsigned int flags,
-                             virTypedParameterPtr params, int nparams,
-                             void *opauqe)
+static const char *node_memory_set(VALUE d, unsigned int flags,
+                                   virTypedParameterPtr params, int nparams,
+                                   void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     if (virNodeSetMemoryParameters(ruby_libvirt_connect_get(d), params, nparams,
                                    flags) < 0) {

data/ext/libvirt/domain.c

@@ -22,7 +22,8 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <ruby.h>
-#include <ruby/st.h>
+/* we need to include st.h since ruby 1.8 needs it for RHash */
+#include <st.h>
 #include <libvirt/libvirt.h>
 #if HAVE_VIRDOMAINQEMUMONITORCOMMAND
 #include <libvirt/libvirt-qemu.h>
@@ -548,7 +549,8 @@ static VALUE libvirt_domain_core_dump(int argc, VALUE *argv, VALUE d)
  * Call virDomainRestore[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainRestore]
  * to restore the domain from the filename.
  */
-static VALUE libvirt_domain_s_restore(VALUE klass, VALUE c, VALUE from)
+static VALUE libvirt_domain_s_restore(VALUE RUBY_LIBVIRT_UNUSED(klass), VALUE c,
+                                      VALUE from)
 {
     ruby_libvirt_generate_call_nil(virDomainRestore,
                                    ruby_libvirt_connect_get(c),
@@ -1853,8 +1855,10 @@ static VALUE libvirt_domain_is_updated(VALUE d)
 }
 #endif
 
-static char *scheduler_nparams(VALUE d, unsigned int flags, void *opaque,
-                               int *nparams)
+static const char *scheduler_nparams(VALUE d,
+                                     unsigned int RUBY_LIBVIRT_UNUSED(flags),
+                                     void *RUBY_LIBVIRT_UNUSED(opaque),
+                                     int *nparams)
 {
     char *type;
 
@@ -1868,8 +1872,9 @@ static char *scheduler_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *scheduler_get(VALUE d, unsigned int flags, void *voidparams,
-                           int *nparams, void *opaque)
+static const char *scheduler_get(VALUE d, unsigned int flags, void *voidparams,
+                                 int *nparams,
+                                 void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
 
@@ -1892,9 +1897,9 @@ static char *scheduler_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *scheduler_set(VALUE d, unsigned int flags,
-                           virTypedParameterPtr params, int nparams,
-                           void *opaque)
+static const char *scheduler_set(VALUE d, unsigned int flags,
+                                 virTypedParameterPtr params, int nparams,
+                                 void *RUBY_LIBVIRT_UNUSED(opaque))
 {
 #if HAVE_TYPE_VIRTYPEDPARAMETERPTR
     if (virDomainSetSchedulerParametersFlags(ruby_libvirt_domain_get(d), params,
@@ -1939,8 +1944,12 @@ static struct ruby_libvirt_typed_param domain_scheduler_allowed[] = {
     {VIR_DOMAIN_SCHEDULER_CPU_SHARES, VIR_TYPED_PARAM_ULLONG},
     {VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, VIR_TYPED_PARAM_ULLONG},
     {VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, VIR_TYPED_PARAM_LLONG},
+#if HAVE_CONST_VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD
     {VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD, VIR_TYPED_PARAM_ULLONG},
+#endif
+#if HAVE_CONST_VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA
     {VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA, VIR_TYPED_PARAM_LLONG},
+#endif
     {VIR_DOMAIN_SCHEDULER_WEIGHT, VIR_TYPED_PARAM_UINT},
     {VIR_DOMAIN_SCHEDULER_CAP, VIR_TYPED_PARAM_UINT},
     {VIR_DOMAIN_SCHEDULER_RESERVATION, VIR_TYPED_PARAM_LLONG},
@@ -1970,8 +1979,9 @@ static VALUE libvirt_domain_scheduler_parameters_equal(VALUE d, VALUE input)
 }
 
 #if HAVE_VIRDOMAINSETMEMORYPARAMETERS
-static char *memory_nparams(VALUE d, unsigned int flags, void *opaque,
-                            int *nparams)
+static const char *memory_nparams(VALUE d, unsigned int flags,
+                                  void *RUBY_LIBVIRT_UNUSED(opaque),
+                                  int *nparams)
 {
     if (virDomainGetMemoryParameters(ruby_libvirt_domain_get(d), NULL, nparams,
                                      flags) < 0) {
@@ -1981,8 +1991,8 @@ static char *memory_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *memory_get(VALUE d, unsigned int flags, void *voidparams,
-                        int *nparams, void *opaque)
+static const char *memory_get(VALUE d, unsigned int flags, void *voidparams,
+                              int *nparams, void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
 
@@ -2000,8 +2010,9 @@ static char *memory_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *memory_set(VALUE d, unsigned int flags,
-                        virTypedParameterPtr params, int nparams, void *opaque)
+static const char *memory_set(VALUE d, unsigned int flags,
+                              virTypedParameterPtr params, int nparams,
+                              void *RUBY_LIBVIRT_UNUSED(opaque))
 {
 #ifdef HAVE_TYPE_VIRTYPEDPARAMETERPTR
     if (virDomainSetMemoryParameters(ruby_libvirt_domain_get(d), params,
@@ -2065,8 +2076,9 @@ static VALUE libvirt_domain_memory_parameters_equal(VALUE d, VALUE in)
 #endif
 
 #if HAVE_VIRDOMAINSETBLKIOPARAMETERS
-static char *blkio_nparams(VALUE d, unsigned int flags, void *opaque,
-                           int *nparams)
+static const char *blkio_nparams(VALUE d, unsigned int flags,
+                                 void *RUBY_LIBVIRT_UNUSED(opaque),
+                                 int *nparams)
 {
     if (virDomainGetBlkioParameters(ruby_libvirt_domain_get(d), NULL, nparams,
                                     flags) < 0) {
@@ -2076,8 +2088,8 @@ static char *blkio_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *blkio_get(VALUE d, unsigned int flags, void *voidparams,
-                       int *nparams, void *opaque)
+static const char *blkio_get(VALUE d, unsigned int flags, void *voidparams,
+                             int *nparams, void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
 
@@ -2095,8 +2107,9 @@ static char *blkio_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *blkio_set(VALUE d, unsigned int flags, virTypedParameterPtr params,
-                       int nparams, void *opaque)
+static const char *blkio_set(VALUE d, unsigned int flags,
+                             virTypedParameterPtr params, int nparams,
+                             void *RUBY_LIBVIRT_UNUSED(opaque))
 {
 #ifdef HAVE_TYPE_VIRTYPEDPARAMETERPTR
     if (virDomainSetBlkioParameters(ruby_libvirt_domain_get(d), params, nparams,
@@ -3178,8 +3191,8 @@ static VALUE libvirt_domain_job_stats(int argc, VALUE *argv, VALUE d)
 #endif
 
 #if HAVE_VIRDOMAINGETBLOCKIOTUNE
-static char *iotune_nparams(VALUE d, unsigned int flags, void *opaque,
-                            int *nparams)
+static const char *iotune_nparams(VALUE d, unsigned int flags, void *opaque,
+                                  int *nparams)
 {
     VALUE disk = (VALUE)opaque;
 
@@ -3192,8 +3205,8 @@ static char *iotune_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *iotune_get(VALUE d, unsigned int flags, void *voidparams,
-                        int *nparams, void *opaque)
+static const char *iotune_get(VALUE d, unsigned int flags, void *voidparams,
+                              int *nparams, void *opaque)
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
     VALUE disk = (VALUE)opaque;
@@ -3206,9 +3219,9 @@ static char *iotune_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *iotune_set(VALUE d, unsigned int flags,
-                        virTypedParameterPtr params, int nparams,
-                        void *opaque)
+static const char *iotune_set(VALUE d, unsigned int flags,
+                              virTypedParameterPtr params, int nparams,
+                              void *opaque)
 {
     VALUE disk = (VALUE)opaque;
 
@@ -3440,8 +3453,8 @@ static VALUE libvirt_domain_block_job_abort(int argc, VALUE *argv, VALUE d)
 #endif
 
 #if HAVE_VIRDOMAINGETINTERFACEPARAMETERS
-static char *interface_nparams(VALUE d, unsigned int flags, void *opaque,
-                               int *nparams)
+static const char *interface_nparams(VALUE d, unsigned int flags, void *opaque,
+                                     int *nparams)
 {
     VALUE device = (VALUE)opaque;
 
@@ -3454,8 +3467,8 @@ static char *interface_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *interface_get(VALUE d, unsigned int flags, void *voidparams,
-                           int *nparams, void *opaque)
+static const char *interface_get(VALUE d, unsigned int flags, void *voidparams,
+                                 int *nparams, void *opaque)
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
     VALUE interface = (VALUE)opaque;
@@ -3468,9 +3481,9 @@ static char *interface_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *interface_set(VALUE d, unsigned int flags,
-                           virTypedParameterPtr params, int nparams,
-                           void *opaque)
+static const char *interface_set(VALUE d, unsigned int flags,
+                                 virTypedParameterPtr params, int nparams,
+                                 void *opaque)
 {
     VALUE device = (VALUE)opaque;
 
@@ -3552,8 +3565,8 @@ static VALUE libvirt_domain_interface_parameters_equal(VALUE d, VALUE in)
 #endif
 
 #if HAVE_VIRDOMAINBLOCKSTATSFLAGS
-static char *block_stats_nparams(VALUE d, unsigned int flags, void *opaque,
-                                 int *nparams)
+static const char *block_stats_nparams(VALUE d, unsigned int flags,
+                                       void *opaque, int *nparams)
 {
     VALUE disk = (VALUE)opaque;
 
@@ -3566,8 +3579,8 @@ static char *block_stats_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *block_stats_get(VALUE d, unsigned int flags, void *voidparams,
-                             int *nparams, void *opaque)
+static const char *block_stats_get(VALUE d, unsigned int flags,
+                                   void *voidparams, int *nparams, void *opaque)
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
     VALUE disk = (VALUE)opaque;
@@ -3605,8 +3618,9 @@ static VALUE libvirt_domain_block_stats_flags(int argc, VALUE *argv, VALUE d)
 #endif
 
 #if HAVE_VIRDOMAINGETNUMAPARAMETERS
-static char *numa_nparams(VALUE d, unsigned int flags, void *opaque,
-                          int *nparams)
+static const char *numa_nparams(VALUE d, unsigned int flags,
+                                void *RUBY_LIBVIRT_UNUSED(opaque),
+                                int *nparams)
 {
     if (virDomainGetNumaParameters(ruby_libvirt_domain_get(d), NULL, nparams,
                                    flags) < 0) {
@@ -3616,8 +3630,8 @@ static char *numa_nparams(VALUE d, unsigned int flags, void *opaque,
     return NULL;
 }
 
-static char *numa_get(VALUE d, unsigned int flags, void *voidparams,
-                      int *nparams, void *opaque)
+static const char *numa_get(VALUE d, unsigned int flags, void *voidparams,
+                            int *nparams, void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     virTypedParameterPtr params = (virTypedParameterPtr)voidparams;
 
@@ -3628,8 +3642,9 @@ static char *numa_get(VALUE d, unsigned int flags, void *voidparams,
     return NULL;
 }
 
-static char *numa_set(VALUE d, unsigned int flags, virTypedParameterPtr params,
-                      int nparams, void *opaque)
+static const char *numa_set(VALUE d, unsigned int flags,
+                            virTypedParameterPtr params, int nparams,
+                            void *RUBY_LIBVIRT_UNUSED(opaque))
 {
     if (virDomainSetNumaParameters(ruby_libvirt_domain_get(d), params,
                                    nparams, flags) < 0) {
@@ -3792,9 +3807,9 @@ static VALUE libvirt_domain_lxc_enter_namespace(int argc, VALUE *argv, VALUE d)
 {
     VALUE fds, flags, result;
     int *fdlist;
-    int i, ret, exception = 0;
+    int ret, exception = 0;
     int *oldfdlist;
-    unsigned int noldfdlist;
+    unsigned int noldfdlist, i;
     struct ruby_libvirt_ary_store_arg args;
 
     rb_scan_args(argc, argv, "11", &fds, &flags);
@@ -3849,7 +3864,9 @@ static struct ruby_libvirt_typed_param migrate3_allowed[] = {
     {VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING},
     {VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG},
     {VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING},
+#if HAVE_CONST_VIR_MIGRATE_PARAM_LISTEN_ADDRESS
     {VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING},
+#endif
 };
 
 /*
@@ -5186,10 +5203,16 @@ void ruby_libvirt_domain_init(void)
                     INT2NUM(VIR_DOMAIN_SNAPSHOT_CREATE_HALT));
     rb_define_const(c_domain_snapshot, "CREATE_DISK_ONLY",
                     INT2NUM(VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT
     rb_define_const(c_domain_snapshot, "CREATE_REUSE_EXT",
                     INT2NUM(VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE
     rb_define_const(c_domain_snapshot, "CREATE_QUIESCE",
                     INT2NUM(VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC
     rb_define_const(c_domain_snapshot, "CREATE_ATOMIC",
                     INT2NUM(VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC));
 #endif

data/ext/libvirt/extconf.rb

@@ -59,7 +59,7 @@ include = with_config("libvirt-include")
 lib = with_config("libvirt-lib")
 if include and lib
   $LIBPATH = [lib] | $LIBPATH
-  $CPPFLAGS += "-I" + include
+  $CPPFLAGS += " -I" + include
   have_library("virt", "virConnectOpen", "libvirt/libvirt.h")
 
   # if we are using custom libvirt libraries, we have to suppress the default
@@ -398,6 +398,12 @@ libvirt_consts = [ 'VIR_MIGRATE_LIVE',
                    'VIR_DOMAIN_BLOCK_JOB_READY',
                    'VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES',
                    'VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC',
+                   'VIR_MIGRATE_PARAM_LISTEN_ADDRESS',
+                   'VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD',
+                   'VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA',
+                   'VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT',
+                   'VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE',
+                   'VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC',
                  ]
 
 virterror_consts = [

data/ext/libvirt/stream.c

@@ -99,8 +99,8 @@ static VALUE libvirt_stream_recv(VALUE s, VALUE bytes)
     return result;
 }
 
-static int internal_sendall(virStreamPtr st, char *data, size_t nbytes,
-                            void *opaque)
+static int internal_sendall(virStreamPtr RUBY_LIBVIRT_UNUSED(st), char *data,
+                            size_t nbytes, void *opaque)
 {
     VALUE result, retcode, buffer;
 
@@ -124,7 +124,7 @@ static int internal_sendall(virStreamPtr st, char *data, size_t nbytes,
 
     StringValue(buffer);
 
-    if (RSTRING_LEN(buffer) > nbytes) {
+    if (RSTRING_LEN(buffer) > (int)nbytes) {
         rb_raise(rb_eArgError, "asked for %zd bytes, block returned %ld",
                  nbytes, RSTRING_LEN(buffer));
     }
@@ -166,8 +166,8 @@ static VALUE libvirt_stream_sendall(int argc, VALUE *argv, VALUE s)
     return Qnil;
 }
 
-static int internal_recvall(virStreamPtr st, const char *buf, size_t nbytes,
-                            void *opaque)
+static int internal_recvall(virStreamPtr RUBY_LIBVIRT_UNUSED(st),
+                            const char *buf, size_t nbytes, void *opaque)
 {
     VALUE result;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - David Lutterkort, Chris Lalancette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings for libvirt.
 email: libvir-list@redhat.com