ruby-libvirt 0.3.0 → 0.4.0

data/ext/libvirt/common.c

@@ -121,7 +121,9 @@ VALUE create_error(VALUE error, const char* method, virConnectPtr conn) {
     rb_iv_set(ruby_errinfo, "@libvirt_function_name", rb_str_new2(method));
 
     if (err != NULL) {
-        rb_iv_set(ruby_errinfo, "@libvirt_code", INT2FIX(err->code));
+        rb_iv_set(ruby_errinfo, "@libvirt_code", INT2NUM(err->code));
+        rb_iv_set(ruby_errinfo, "@libvirt_component", INT2NUM(err->domain));
+        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));

data/ext/libvirt/connect.c

@@ -24,12 +24,7 @@
 #include "extconf.h"
 #include "common.h"
 #include "domain.h"
-#include "interface.h"
 #include "network.h"
-#include "nodedevice.h"
-#include "nwfilter.h"
-#include "secret.h"
-#include "storage.h"
 
 static VALUE c_connect;
 static VALUE c_node_security_model;
@@ -247,7 +242,8 @@ static VALUE libvirt_conn_node_free_memory(VALUE s) {
  * to retrieve the amount of free memory in each NUMA cell on the host for
  * this connection.
  */
-static VALUE libvirt_conn_node_cells_free_memory(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_conn_node_cells_free_memory(int argc, VALUE *argv,
+                                                 VALUE s) {
     int r;
     virConnectPtr conn = connect_get(s);
     VALUE cells;
@@ -366,7 +362,7 @@ static VALUE libvirt_conn_compare_cpu(int argc, VALUE *argv, VALUE s) {
 
     rb_scan_args(argc, argv, "11", &xml, &flags);
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     gen_call_int(virConnectCompareCPU, conn(s), connect_get(s),
                  StringValueCStr(xml), NUM2UINT(flags));
@@ -396,6 +392,10 @@ static VALUE libvirt_conn_baseline_cpu(int argc, VALUE *argv, VALUE s) {
     struct rb_ary_entry_arg arg;
 
     rb_scan_args(argc, argv, "11", &xmlcpus, &flags_val);
+    /*
+     * We check flags up-front here so that we get a TypeError early on if
+     * flags is bogus.
+     */
     if (NIL_P(flags_val))
         flags = 0;
     else
@@ -456,17 +456,21 @@ static int domain_event_lifecycle_callback(virConnectPtr conn,
         rb_raise(rb_eTypeError,
                  "wrong domain event lifecycle callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
     newc = connect_new(conn);
     if (strcmp(rb_obj_classname(cb), "Symbol") == 0)
         rb_funcall(rb_class_of(cb), rb_to_id(cb), 5, newc,
-                   domain_new(dom, newc), INT2FIX(event), INT2FIX(detail),
+                   domain_new(dom, newc), INT2NUM(event), INT2NUM(detail),
                    cb_opaque);
     else if (strcmp(rb_obj_classname(cb), "Proc") == 0)
         rb_funcall(cb, rb_intern("call"), 5, newc, domain_new(dom, newc),
-                   INT2FIX(event), INT2FIX(detail), cb_opaque);
+                   INT2NUM(event), INT2NUM(detail), cb_opaque);
     else
         rb_raise(rb_eTypeError,
                  "wrong domain event lifecycle callback (expected Symbol or Proc)");
@@ -487,6 +491,10 @@ static int domain_event_reboot_callback(virConnectPtr conn, virDomainPtr dom,
         rb_raise(rb_eTypeError,
                  "wrong domain event reboot callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
@@ -515,6 +523,10 @@ static int domain_event_rtc_callback(virConnectPtr conn, virDomainPtr dom,
         rb_raise(rb_eTypeError,
                  "wrong domain event rtc callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
@@ -543,16 +555,20 @@ static int domain_event_watchdog_callback(virConnectPtr conn, virDomainPtr dom,
         rb_raise(rb_eTypeError,
                  "wrong domain event watchdog callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
     newc = connect_new(conn);
     if (strcmp(rb_obj_classname(cb), "Symbol") == 0)
         rb_funcall(rb_class_of(cb), rb_to_id(cb), 4, newc,
-                   domain_new(dom, newc), INT2FIX(action), cb_opaque);
+                   domain_new(dom, newc), INT2NUM(action), cb_opaque);
     else if (strcmp(rb_obj_classname(cb), "Proc") == 0)
         rb_funcall(cb, rb_intern("call"), 4, newc, domain_new(dom, newc),
-                   INT2FIX(action), cb_opaque);
+                   INT2NUM(action), cb_opaque);
     else
         rb_raise(rb_eTypeError,
                  "wrong domain event watchdog callback (expected Symbol or Proc)");
@@ -574,6 +590,10 @@ static int domain_event_io_error_callback(virConnectPtr conn, virDomainPtr dom,
         rb_raise(rb_eTypeError,
                  "wrong domain event IO error callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
@@ -581,11 +601,11 @@ static int domain_event_io_error_callback(virConnectPtr conn, virDomainPtr dom,
     if (strcmp(rb_obj_classname(cb), "Symbol") == 0)
         rb_funcall(rb_class_of(cb), rb_to_id(cb), 6, newc,
                    domain_new(dom, newc), rb_str_new2(src_path),
-                   rb_str_new2(dev_alias), INT2FIX(action), cb_opaque);
+                   rb_str_new2(dev_alias), INT2NUM(action), cb_opaque);
     else if (strcmp(rb_obj_classname(cb), "Proc") == 0)
         rb_funcall(cb, rb_intern("call"), 6, newc, domain_new(dom, newc),
                    rb_str_new2(src_path), rb_str_new2(dev_alias),
-                   INT2FIX(action), cb_opaque);
+                   INT2NUM(action), cb_opaque);
     else
         rb_raise(rb_eTypeError,
                  "wrong domain event IO error callback (expected Symbol or Proc)");
@@ -609,6 +629,10 @@ static int domain_event_io_error_reason_callback(virConnectPtr conn,
         rb_raise(rb_eTypeError,
                  "wrong domain event IO error reason callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
@@ -616,12 +640,12 @@ static int domain_event_io_error_reason_callback(virConnectPtr conn,
     if (strcmp(rb_obj_classname(cb), "Symbol") == 0)
         rb_funcall(rb_class_of(cb), rb_to_id(cb), 7, newc,
                    domain_new(dom, newc), rb_str_new2(src_path),
-                   rb_str_new2(dev_alias), INT2FIX(action),
+                   rb_str_new2(dev_alias), INT2NUM(action),
                    rb_str_new2(reason), cb_opaque);
     else if (strcmp(rb_obj_classname(cb), "Proc") == 0)
         rb_funcall(cb, rb_intern("call"), 7, newc, domain_new(dom, newc),
                    rb_str_new2(src_path), rb_str_new2(dev_alias),
-                   INT2FIX(action), rb_str_new2(reason), cb_opaque);
+                   INT2NUM(action), rb_str_new2(reason), cb_opaque);
     else
         rb_raise(rb_eTypeError,
                  "wrong domain event IO error reason callback (expected Symbol or Proc)");
@@ -650,17 +674,21 @@ static int domain_event_graphics_callback(virConnectPtr conn, virDomainPtr dom,
         rb_raise(rb_eTypeError,
                  "wrong domain event graphics callback argument type (expected Array)");
 
+    if (RARRAY_LEN(passthrough) != 2)
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
+                 RARRAY_LEN(passthrough));
+
     cb = rb_ary_entry(passthrough, 0);
     cb_opaque = rb_ary_entry(passthrough, 1);
 
     local_hash = rb_hash_new();
-    rb_hash_aset(local_hash, rb_str_new2("family"), INT2FIX(local->family));
+    rb_hash_aset(local_hash, rb_str_new2("family"), INT2NUM(local->family));
     rb_hash_aset(local_hash, rb_str_new2("node"), rb_str_new2(local->node));
     rb_hash_aset(local_hash, rb_str_new2("service"),
                  rb_str_new2(local->service));
 
     remote_hash = rb_hash_new();
-    rb_hash_aset(remote_hash, rb_str_new2("family"), INT2FIX(remote->family));
+    rb_hash_aset(remote_hash, rb_str_new2("family"), INT2NUM(remote->family));
     rb_hash_aset(remote_hash, rb_str_new2("node"), rb_str_new2(remote->node));
     rb_hash_aset(remote_hash, rb_str_new2("service"),
                  rb_str_new2(remote->service));
@@ -677,12 +705,12 @@ static int domain_event_graphics_callback(virConnectPtr conn, virDomainPtr dom,
     newc = connect_new(conn);
     if (strcmp(rb_obj_classname(cb), "Symbol") == 0)
         rb_funcall(rb_class_of(cb), rb_to_id(cb), 8, newc,
-                   domain_new(dom, newc), INT2FIX(phase), local_hash,
+                   domain_new(dom, newc), INT2NUM(phase), local_hash,
                    remote_hash, rb_str_new2(authScheme), subject_array,
                    cb_opaque);
     else if (strcmp(rb_obj_classname(cb), "Proc") == 0)
         rb_funcall(cb, rb_intern("call"), 8, newc, domain_new(dom, newc),
-                   INT2FIX(phase), local_hash, remote_hash,
+                   INT2NUM(phase), local_hash, remote_hash,
                    rb_str_new2(authScheme), subject_array, cb_opaque);
     else
         rb_raise(rb_eTypeError,
@@ -698,7 +726,7 @@ static int domain_event_graphics_callback(virConnectPtr conn, virDomainPtr dom,
  * Call +virConnectDomainEventRegisterAny+[http://www.libvirt.org/html/libvirt-libvirt.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
- * by a Symbol (that is the name of a method to callback) or a Proc.  Note that
+ * be a Symbol (that is the name of a method to callback) or a Proc.  Note that
  * the callback must accept different numbers of arguments depending on the
  * eventID passed in.  The arguments are as follows:
  *
@@ -804,7 +832,7 @@ static int domain_event_callback(virConnectPtr conn,
  *
  * Call +virConnectDomainEventRegister+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainEventRegister]
  * to register callback for domain lifecycle events with libvirt.  The
- * callback can either by a Symbol (that is the name of a method to callback)
+ * 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,
  * Libvirt::Domain, event, detail, opaque.  The opaque parameter to
  * domain_event_register can be any valid ruby type, and will be passed into
@@ -932,7 +960,7 @@ static VALUE libvirt_conn_list_defined_domains(VALUE s) {
  *
  * Call +virDomainCreateLinux+[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCreateLinux]
  * to start a transient domain from the given XML.  Deprecated; use
- * dom.create_xml instead.
+ * conn.create_domain_xml instead.
  */
 static VALUE libvirt_conn_create_linux(int argc, VALUE *argv, VALUE c) {
     virDomainPtr dom;
@@ -942,7 +970,7 @@ static VALUE libvirt_conn_create_linux(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     dom = virDomainCreateLinux(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(dom == NULL, create_error(e_Error, "virDomainCreateLinux", conn));
@@ -966,7 +994,7 @@ static VALUE libvirt_conn_create_xml(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     dom = virDomainCreateXML(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(dom == NULL, create_error(e_Error, "virDomainCreateXML", conn));
@@ -1055,7 +1083,8 @@ static VALUE libvirt_conn_define_domain_xml(VALUE c, VALUE xml) {
  * Call +virConnectDomainXMLFromNative+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectDomainXMLFromNative]
  * to convert a native hypervisor domain representation to libvirt XML.
  */
-static VALUE libvirt_conn_domain_xml_from_native(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_conn_domain_xml_from_native(int argc, VALUE *argv,
+                                                 VALUE s) {
     VALUE nativeFormat, xml, flags;
     char *ret;
     VALUE result;
@@ -1063,7 +1092,7 @@ static VALUE libvirt_conn_domain_xml_from_native(int argc, VALUE *argv, VALUE s)
     rb_scan_args(argc, argv, "21", &nativeFormat, &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     ret = virConnectDomainXMLFromNative(conn(s), StringValueCStr(nativeFormat),
                                         StringValueCStr(xml), NUM2UINT(flags));
@@ -1094,7 +1123,7 @@ static VALUE libvirt_conn_domain_xml_to_native(int argc, VALUE *argv, VALUE s) {
     rb_scan_args(argc, argv, "21", &nativeFormat, &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     ret = virConnectDomainXMLToNative(conn(s), StringValueCStr(nativeFormat),
                                       StringValueCStr(xml), NUM2UINT(flags));
@@ -1206,7 +1235,7 @@ static VALUE libvirt_conn_define_interface_xml(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     iface = virInterfaceDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(iface == NULL, create_error(e_DefinitionError, "virInterfaceDefineXML",
@@ -1349,7 +1378,7 @@ static VALUE libvirt_conn_num_of_nodedevices(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "02", &cap, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     result = virNodeNumOfDevices(conn, get_string_or_nil(cap), NUM2UINT(flags));
     _E(result < 0, create_error(e_RetrieveError, "virNodeNumOfDevices", conn));
@@ -1424,7 +1453,8 @@ static VALUE libvirt_conn_lookup_nodedevice_by_name(VALUE c, VALUE name) {
  * Call +virNodeDeviceCreateXML+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceCreateXML]
  * to create a new node device from xml.
  */
-static VALUE libvirt_conn_create_nodedevice_xml(int argc, VALUE *argv, VALUE c) {
+static VALUE libvirt_conn_create_nodedevice_xml(int argc, VALUE *argv,
+                                                VALUE c) {
     virNodeDevicePtr nodedev;
     virConnectPtr conn = connect_get(c);
     VALUE xml, flags;
@@ -1432,7 +1462,7 @@ static VALUE libvirt_conn_create_nodedevice_xml(int argc, VALUE *argv, VALUE c)
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     nodedev = virNodeDeviceCreateXML(conn, StringValueCStr(xml),
                                      NUM2UINT(flags));
@@ -1573,7 +1603,8 @@ static VALUE libvirt_conn_lookup_secret_by_uuid(VALUE c, VALUE uuid) {
  * Call +virSecretLookupByUsage+[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretLookupByUsage]
  * to retrieve a secret by usagetype.
  */
-static VALUE libvirt_conn_lookup_secret_by_usage(VALUE c, VALUE usagetype, VALUE usageID) {
+static VALUE libvirt_conn_lookup_secret_by_usage(VALUE c, VALUE usagetype,
+                                                 VALUE usageID) {
     virSecretPtr secret;
     virConnectPtr conn = connect_get(c);
 
@@ -1600,7 +1631,7 @@ static VALUE libvirt_conn_define_secret_xml(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     secret = virSecretDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(secret == NULL, create_error(e_DefinitionError, "virSecretDefineXML",
@@ -1709,7 +1740,7 @@ static VALUE libvirt_conn_create_pool_xml(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     pool = virStoragePoolCreateXML(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(pool == NULL, create_error(e_Error, "virStoragePoolCreateXML", conn));
@@ -1732,7 +1763,7 @@ static VALUE libvirt_conn_define_pool_xml(int argc, VALUE *argv, VALUE c) {
     rb_scan_args(argc, argv, "11", &xml, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     pool = virStoragePoolDefineXML(conn, StringValueCStr(xml), NUM2UINT(flags));
     _E(pool == NULL, create_error(e_DefinitionError, "virStoragePoolDefineXML",
@@ -1748,13 +1779,14 @@ static VALUE libvirt_conn_define_pool_xml(int argc, VALUE *argv, VALUE c) {
  * Call +virConnectFindStoragePoolSources+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectFindStoragePoolSources]
  * to find the storage pool sources corresponding to type.
  */
-static VALUE libvirt_conn_find_storage_pool_sources(int argc, VALUE *argv, VALUE c) {
+static VALUE libvirt_conn_find_storage_pool_sources(int argc, VALUE *argv,
+                                                    VALUE c) {
     VALUE type, srcSpec_val, flags;
 
     rb_scan_args(argc, argv, "12", &type, &srcSpec_val, &flags);
 
     if (NIL_P(flags))
-        flags = INT2FIX(0);
+        flags = INT2NUM(0);
 
     gen_call_string(virConnectFindStoragePoolSources, conn(c), 1,
                     connect_get(c), StringValueCStr(type),
@@ -1762,6 +1794,110 @@ static VALUE libvirt_conn_find_storage_pool_sources(int argc, VALUE *argv, VALUE
 }
 #endif
 
+#if HAVE_VIRCONNECTGETSYSINFO
+/*
+ * call-seq:
+ *   conn.sys_info(flags=0) -> string
+ *
+ * Call +virConnectGetSysinfo+[http://www.libvirt.org/html/libvirt-libvirt.html#virConnectGetSysinfo]
+ * to get machine-specific information about the hypervisor.  This may include
+ * data such as the host UUID, the BIOS version, etc.
+ */
+static VALUE libvirt_conn_get_sys_info(int argc, VALUE *argv, VALUE c) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    if (NIL_P(flags))
+        flags = INT2NUM(0);
+
+    gen_call_string(virConnectGetSysinfo, conn(c), 1, connect_get(c),
+                    NUM2UINT(flags));
+}
+#endif
+
+#if HAVE_TYPE_VIRSTREAMPTR
+extern VALUE stream_new(virStreamPtr s, VALUE conn);
+
+/*
+ * call-seq:
+ *   conn.stream(flags=0) -> Libvirt::Stream
+ *
+ * Call +virStreamNew+[http://www.libvirt.org/html/libvirt-libvirt.html#virStreamNew]
+ * to create a new stream.
+ */
+static VALUE libvirt_conn_stream(int argc, VALUE *argv, VALUE c) {
+    VALUE flags;
+    virStreamPtr stream;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    if (NIL_P(flags))
+        flags = INT2NUM(0);
+
+    stream = virStreamNew(connect_get(c), NUM2UINT(flags));
+
+    _E(stream == NULL, create_error(e_RetrieveError, "virStreamNew", conn(c)));
+
+    return 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.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.
+ */
+static VALUE libvirt_conn_interface_change_begin(int argc, VALUE *argv,
+                                                 VALUE c) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    gen_call_void(virInterfaceChangeBegin, conn(c), connect_get(c),
+                  NUM2UINT(flags));
+}
+
+/*
+ * call-seq:
+ *   conn.interface_change_commit(flags=0) -> nil
+ *
+ * Call +virInterfaceChangeCommit+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceChangeCommit]
+ * to commit the interface changes since the last conn.interface_change_begin.
+ */
+static VALUE libvirt_conn_interface_change_commit(int argc, VALUE *argv,
+                                                  VALUE c) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    gen_call_void(virInterfaceChangeCommit, conn(c), connect_get(c),
+                  NUM2UINT(flags));
+}
+
+/*
+ * call-seq:
+ *   conn.interface_change_rollback(flags=0) -> nil
+ *
+ * Call +virInterfaceChangeRollback+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceChangeRollback]
+ * to rollback to the restore point saved by conn.interface_change_begin.
+ */
+static VALUE libvirt_conn_interface_change_rollback(int argc, VALUE *argv,
+                                                    VALUE c) {
+    VALUE flags;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    gen_call_void(virInterfaceChangeRollback, conn(c), connect_get(c),
+                  NUM2UINT(flags));
+}
+#endif
+
 /*
  * Class Libvirt::Connect
  */
@@ -1840,7 +1976,7 @@ void init_connect()
      * 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
-     * if we have to check for HAVE_CONST_VIR_DOMAIN_EVENT_DEFINED and
+     * 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.
      */
@@ -1961,6 +2097,11 @@ void init_connect()
                     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_VIRCONNECTDOMAINEVENTREGISTER
     rb_define_method(c_connect, "domain_event_register",
                      libvirt_conn_domain_event_register, -1);
@@ -2105,4 +2246,20 @@ void init_connect()
     rb_define_method(c_connect, "discover_storage_pool_sources",
                      libvirt_conn_find_storage_pool_sources, -1);
 #endif
+
+#if HAVE_VIRCONNECTGETSYSINFO
+    rb_define_method(c_connect, "sys_info", libvirt_conn_get_sys_info, -1);
+#endif
+#if HAVE_TYPE_VIRSTREAMPTR
+    rb_define_method(c_connect, "stream", libvirt_conn_stream, -1);
+#endif
+
+#if HAVE_VIRINTERFACECHANGEBEGIN
+    rb_define_method(c_connect, "interface_change_begin",
+                     libvirt_conn_interface_change_begin, -1);
+    rb_define_method(c_connect, "interface_change_commit",
+                     libvirt_conn_interface_change_commit, -1);
+    rb_define_method(c_connect, "interface_change_rollback",
+                     libvirt_conn_interface_change_rollback, -1);
+#endif
 }