ruby-libvirt 0.5.2 → 0.8.0

data/ext/libvirt/domain.c

@@ -2,7 +2,7 @@
  * domain.c: virDomain methods
  *
  * 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
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <ruby.h>
 /* we need to include st.h since ruby 1.8 needs it for RHash */
-#include <st.h>
+#include <ruby/st.h>
 #include <libvirt/libvirt.h>
 #if HAVE_VIRDOMAINQEMUMONITORCOMMAND
 #include <libvirt/libvirt-qemu.h>
@@ -129,7 +129,7 @@ static void domain_input_to_fixnum_and_flags(VALUE in, VALUE *hash, VALUE *flags
  * call-seq:
  *   dom.migrate(dconn, flags=0, dname=nil, uri=nil, bandwidth=0) -> Libvirt::Domain
  *
- * Call virDomainMigrate[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrate]
+ * Call virDomainMigrate[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrate]
  * to migrate a domain from the host on this connection to the connection
  * referenced in dconn.
  */
@@ -159,7 +159,7 @@ static VALUE libvirt_domain_migrate(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.migrate_to_uri(duri, flags=0, dname=nil, bandwidth=0) -> nil
  *
- * Call virDomainMigrateToURI[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI]
+ * Call virDomainMigrateToURI[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateToURI]
  * to migrate a domain from the host on this connection to the host whose
  * libvirt URI is duri.
  */
@@ -183,7 +183,7 @@ static VALUE libvirt_domain_migrate_to_uri(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.migrate_set_max_downtime(downtime, flags=0) -> nil
  *
- * Call virDomainMigrateSetMaxDowntime[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateSetMaxDowntime]
+ * Call virDomainMigrateSetMaxDowntime[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetMaxDowntime]
  * to set the maximum downtime desired for live migration.  Deprecated; use
  * dom.migrate_max_downtime= instead.
  */
@@ -205,7 +205,7 @@ static VALUE libvirt_domain_migrate_set_max_downtime(int argc, VALUE *argv,
  * call-seq:
  *   dom.migrate_max_downtime = downtime,flags=0
  *
- * Call virDomainMigrateSetMaxDowntime[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateSetMaxDowntime]
+ * Call virDomainMigrateSetMaxDowntime[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetMaxDowntime]
  * to set the maximum downtime desired for live migration.
  */
 static VALUE libvirt_domain_migrate_max_downtime_equal(VALUE d, VALUE in)
@@ -227,7 +227,7 @@ static VALUE libvirt_domain_migrate_max_downtime_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.migrate2(dconn, dxml=nil, flags=0, dname=nil, uri=nil, bandwidth=0) -> Libvirt::Domain
  *
- * Call virDomainMigrate2[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrate2]
+ * Call virDomainMigrate2[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrate2]
  * to migrate a domain from the host on this connection to the connection
  * referenced in dconn.
  */
@@ -257,7 +257,7 @@ static VALUE libvirt_domain_migrate2(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.migrate_to_uri2(duri=nil, migrate_uri=nil, dxml=nil, flags=0, dname=nil, bandwidth=0) -> nil
  *
- * Call virDomainMigrateToURI2[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI2]
+ * Call virDomainMigrateToURI2[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateToURI2]
  * to migrate a domain from the host on this connection to the host whose
  * libvirt URI is duri.
  */
@@ -283,7 +283,7 @@ static VALUE libvirt_domain_migrate_to_uri2(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.migrate_set_max_speed(bandwidth, flags=0) -> nil
  *
- * Call virDomainMigrateSetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateSetMaxSpeed]
+ * Call virDomainMigrateSetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetMaxSpeed]
  * to set the maximum bandwidth allowed for live migration.  Deprecated; use
  * dom.migrate_max_speed= instead.
  */
@@ -305,7 +305,7 @@ static VALUE libvirt_domain_migrate_set_max_speed(int argc, VALUE *argv,
  * call-seq:
  *   dom.migrate_max_speed = bandwidth,flags=0
  *
- * Call virDomainMigrateSetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateSetMaxSpeed]
+ * Call virDomainMigrateSetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetMaxSpeed]
  * to set the maximum bandwidth allowed for live migration.
  */
 static VALUE libvirt_domain_migrate_max_speed_equal(VALUE d, VALUE in)
@@ -326,7 +326,7 @@ static VALUE libvirt_domain_migrate_max_speed_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.shutdown(flags=0) -> nil
  *
- * Call virDomainShutdown[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainShutdown]
+ * Call virDomainShutdown[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdown]
  * to do a soft shutdown of the domain.  The mechanism for doing the shutdown
  * is hypervisor specific, and may require software running inside the domain
  * to succeed.
@@ -357,7 +357,7 @@ static VALUE libvirt_domain_shutdown(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.reboot(flags=0) -> nil
  *
- * Call virDomainReboot[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainReboot]
+ * Call virDomainReboot[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainReboot]
  * to do a reboot of the domain.
  */
 static VALUE libvirt_domain_reboot(int argc, VALUE *argv, VALUE d)
@@ -375,7 +375,7 @@ static VALUE libvirt_domain_reboot(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.destroy(flags=0) -> nil
  *
- * Call virDomainDestroy[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainDestroy]
+ * Call virDomainDestroy[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroy]
  * to do a hard power-off of the domain.
  */
 static VALUE libvirt_domain_destroy(int argc, VALUE *argv, VALUE d)
@@ -403,7 +403,7 @@ static VALUE libvirt_domain_destroy(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.suspend -> nil
  *
- * Call virDomainSuspend[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSuspend]
+ * Call virDomainSuspend[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSuspend]
  * to stop the domain from executing.  The domain will still continue to
  * consume memory, but will not take any CPU time.
  */
@@ -418,7 +418,7 @@ static VALUE libvirt_domain_suspend(VALUE d)
  * call-seq:
  *   dom.resume -> nil
  *
- * Call virDomainResume[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainResume]
+ * Call virDomainResume[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume]
  * to resume a suspended domain.  After this call the domain will start
  * consuming CPU resources again.
  */
@@ -432,7 +432,7 @@ static VALUE libvirt_domain_resume(VALUE d)
  * call-seq:
  *   dom.save(filename, dxml=nil, flags=0) -> nil
  *
- * Call virDomainSave[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSave]
+ * Call virDomainSave[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSave]
  * to save the domain state to filename.  After this call, the domain will no
  * longer be consuming any resources.
  */
@@ -467,7 +467,7 @@ static VALUE libvirt_domain_save(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.managed_save(flags=0) -> nil
  *
- * Call virDomainManagedSave[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSave]
+ * Call virDomainManagedSave[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSave]
  * to do a managed save of the domain.  The domain will be saved to a place
  * of libvirt's choosing.
  */
@@ -487,7 +487,7 @@ static VALUE libvirt_domain_managed_save(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.has_managed_save?(flags=0) -> [True|False]
  *
- * Call virDomainHasManagedSaveImage[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainHasManagedSaveImage]
+ * Call virDomainHasManagedSaveImage[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainHasManagedSaveImage]
  * to determine if a particular domain has a managed save image.
  */
 static VALUE libvirt_domain_has_managed_save(int argc, VALUE *argv, VALUE d)
@@ -506,7 +506,7 @@ static VALUE libvirt_domain_has_managed_save(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.managed_save_remove(flags=0) -> nil
  *
- * Call virDomainManagedSaveRemove[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSaveRemove]
+ * Call virDomainManagedSaveRemove[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainManagedSaveRemove]
  * to remove the managed save image for a domain.
  */
 static VALUE libvirt_domain_managed_save_remove(int argc, VALUE *argv, VALUE d)
@@ -526,7 +526,7 @@ static VALUE libvirt_domain_managed_save_remove(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.core_dump(filename, flags=0) -> nil
  *
- * Call virDomainCoreDump[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCoreDump]
+ * Call virDomainCoreDump[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCoreDump]
  * to do a full memory dump of the domain to filename.
  */
 static VALUE libvirt_domain_core_dump(int argc, VALUE *argv, VALUE d)
@@ -546,7 +546,7 @@ static VALUE libvirt_domain_core_dump(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   Libvirt::Domain::restore(conn, filename) -> nil
  *
- * Call virDomainRestore[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainRestore]
+ * Call virDomainRestore[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainRestore]
  * to restore the domain from the filename.
  */
 static VALUE libvirt_domain_s_restore(VALUE RUBY_LIBVIRT_UNUSED(klass), VALUE c,
@@ -562,7 +562,7 @@ static VALUE libvirt_domain_s_restore(VALUE RUBY_LIBVIRT_UNUSED(klass), VALUE c,
  * call-seq:
  *   dom.info -> Libvirt::Domain::Info
  *
- * Call virDomainGetInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetInfo]
+ * Call virDomainGetInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetInfo]
  * to retrieve domain information.
  */
 static VALUE libvirt_domain_info(VALUE d)
@@ -590,7 +590,7 @@ static VALUE libvirt_domain_info(VALUE d)
  * call-seq:
  *   dom.security_label -> Libvirt::Domain::SecurityLabel
  *
- * Call virDomainGetSecurityLabel[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetSecurityLabel]
+ * Call virDomainGetSecurityLabel[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSecurityLabel]
  * to retrieve the security label applied to this domain.
  */
 static VALUE libvirt_domain_security_label(VALUE d)
@@ -616,7 +616,7 @@ static VALUE libvirt_domain_security_label(VALUE d)
  * call-seq:
  *   dom.block_stats(path) -> Libvirt::Domain::BlockStats
  *
- * Call virDomainBlockStats[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockStats]
+ * Call virDomainBlockStats[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockStats]
  * to retrieve statistics about domain block device path.
  */
 static VALUE libvirt_domain_block_stats(VALUE d, VALUE path)
@@ -645,7 +645,7 @@ static VALUE libvirt_domain_block_stats(VALUE d, VALUE path)
  * call-seq:
  *   dom.memory_stats(flags=0) -> [ Libvirt::Domain::MemoryStats ]
  *
- * Call virDomainMemoryStats[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMemoryStats]
+ * Call virDomainMemoryStats[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats]
  * to retrieve statistics about the amount of memory consumed by a domain.
  */
 static VALUE libvirt_domain_memory_stats(int argc, VALUE *argv, VALUE d)
@@ -689,7 +689,7 @@ static VALUE libvirt_domain_memory_stats(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.blockinfo(path, flags=0) -> Libvirt::Domain::BlockInfo
  *
- * Call virDomainGetBlockInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetBlockInfo]
+ * Call virDomainGetBlockInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlockInfo]
  * to retrieve information about the backing file path for the domain.
  */
 static VALUE libvirt_domain_block_info(int argc, VALUE *argv, VALUE d)
@@ -718,9 +718,9 @@ static VALUE libvirt_domain_block_info(int argc, VALUE *argv, VALUE d)
 #if HAVE_VIRDOMAINBLOCKPEEK
 /*
  * call-seq:
- *   dom.block_peek(path, offset, size, flags=0) -> string
+ *   dom.block_peek(path, offset, size, flags=0) -> String
  *
- * Call virDomainBlockPeek[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockPeek]
+ * Call virDomainBlockPeek[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockPeek]
  * to read size number of bytes, starting at offset offset from domain backing
  * file path.  Due to limitations of the libvirt remote protocol, the user
  * should never request more than 64k bytes.
@@ -748,9 +748,9 @@ static VALUE libvirt_domain_block_peek(int argc, VALUE *argv, VALUE d)
 #if HAVE_VIRDOMAINMEMORYPEEK
 /*
  * call-seq:
- *   dom.memory_peek(start, size, flags=Libvirt::Domain::MEMORY_VIRTUAL) -> string
+ *   dom.memory_peek(start, size, flags=Libvirt::Domain::MEMORY_VIRTUAL) -> String
  *
- * Call virDomainMemoryPeek[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMemoryPeek]
+ * Call virDomainMemoryPeek[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryPeek]
  * to read size number of bytes from offset start from the domain memory.
  * Due to limitations of the libvirt remote protocol, the user
  * should never request more than 64k bytes.
@@ -781,7 +781,7 @@ static VALUE libvirt_domain_memory_peek(int argc, VALUE *argv, VALUE d)
 /* call-seq:
  *   dom.vcpus -> [ Libvirt::Domain::VCPUInfo ]
  *
- * Call virDomainGetVcpus[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetVcpus]
+ * Call virDomainGetVcpus[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpus]
  * to retrieve detailed information about the state of a domain's virtual CPUs.
  */
 static VALUE libvirt_domain_vcpus(VALUE d)
@@ -803,7 +803,7 @@ static VALUE libvirt_domain_vcpus(VALUE d)
 
     cpumaplen = VIR_CPU_MAPLEN(maxcpus);
 
-    cpumap = alloca(cpumaplen);
+    cpumap = alloca(sizeof(unsigned char) * cpumaplen * dominfo.nrVirtCpu);
 
     r = virDomainGetVcpus(ruby_libvirt_domain_get(d), cpuinfo,
                           dominfo.nrVirtCpu, cpumap, cpumaplen);
@@ -832,15 +832,16 @@ static VALUE libvirt_domain_vcpus(VALUE d)
 
     result = rb_ary_new();
 
-    for (i = 0; i < dominfo.nrVirtCpu; i++) {
+    for (i = 0; i < r; i++) {
         vcpuinfo = rb_class_new_instance(0, NULL, c_domain_vcpuinfo);
-        rb_iv_set(vcpuinfo, "@number", UINT2NUM(i));
         if (cpuinfo != NULL) {
+            rb_iv_set(vcpuinfo, "@number", INT2NUM(cpuinfo[i].number));
             rb_iv_set(vcpuinfo, "@state", INT2NUM(cpuinfo[i].state));
             rb_iv_set(vcpuinfo, "@cpu_time", ULL2NUM(cpuinfo[i].cpuTime));
             rb_iv_set(vcpuinfo, "@cpu", INT2NUM(cpuinfo[i].cpu));
         }
         else {
+            rb_iv_set(vcpuinfo, "@number", Qnil);
             rb_iv_set(vcpuinfo, "@state", Qnil);
             rb_iv_set(vcpuinfo, "@cpu_time", Qnil);
             rb_iv_set(vcpuinfo, "@cpu", Qnil);
@@ -865,7 +866,7 @@ static VALUE libvirt_domain_vcpus(VALUE d)
  * call-seq:
  *   dom.active? -> [true|false]
  *
- * Call virDomainIsActive[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainIsActive]
+ * Call virDomainIsActive[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsActive]
  * to determine if this domain is currently active.
  */
 static VALUE libvirt_domain_active_p(VALUE d)
@@ -881,7 +882,7 @@ static VALUE libvirt_domain_active_p(VALUE d)
  * call-seq:
  *   dom.persistent? -> [true|false]
  *
- * Call virDomainIsPersistent[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainIsPersistent]
+ * Call virDomainIsPersistent[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsPersistent]
  * to determine if this is a persistent domain.
  */
 static VALUE libvirt_domain_persistent_p(VALUE d)
@@ -896,7 +897,7 @@ static VALUE libvirt_domain_persistent_p(VALUE d)
  * call-seq:
  *   dom.ifinfo(if) -> Libvirt::Domain::IfInfo
  *
- * Call virDomainInterfaceStats[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainInterfaceStats]
+ * Call virDomainInterfaceStats[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainInterfaceStats]
  * to retrieve statistics about domain interface if.
  */
 static VALUE libvirt_domain_if_stats(VALUE d, VALUE sif)
@@ -928,9 +929,9 @@ static VALUE libvirt_domain_if_stats(VALUE d, VALUE sif)
 
 /*
  * call-seq:
- *   dom.name -> string
+ *   dom.name -> String
  *
- * Call virDomainGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetName]
+ * Call virDomainGetName[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetName]
  * to retrieve the name of this domain.
  */
 static VALUE libvirt_domain_name(VALUE d)
@@ -942,9 +943,9 @@ static VALUE libvirt_domain_name(VALUE d)
 
 /*
  * call-seq:
- *   dom.id -> fixnum
+ *   dom.id -> Fixnum
  *
- * Call virDomainGetID[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetID]
+ * Call virDomainGetID[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetID]
  * to retrieve the ID of this domain.  If the domain isn't running, this will
  * be -1.
  */
@@ -967,9 +968,9 @@ static VALUE libvirt_domain_id(VALUE d)
 
 /*
  * call-seq:
- *   dom.uuid -> string
+ *   dom.uuid -> String
  *
- * Call virDomainGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetUUIDString]
+ * Call virDomainGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDString]
  * to retrieve the UUID of this domain.
  */
 static VALUE libvirt_domain_uuid(VALUE d)
@@ -981,9 +982,9 @@ static VALUE libvirt_domain_uuid(VALUE d)
 
 /*
  * call-seq:
- *   dom.os_type -> string
+ *   dom.os_type -> String
  *
- * Call virDomainGetOSType[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetOSType]
+ * Call virDomainGetOSType[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetOSType]
  * to retrieve the os_type of this domain.  In libvirt terms, os_type determines
  * whether this domain is fully virtualized, paravirtualized, or a container.
  */
@@ -996,9 +997,9 @@ static VALUE libvirt_domain_os_type(VALUE d)
 
 /*
  * call-seq:
- *   dom.max_memory -> fixnum
+ *   dom.max_memory -> Fixnum
  *
- * Call virDomainGetMaxMemory[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetMaxMemory]
+ * Call virDomainGetMaxMemory[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMaxMemory]
  * to retrieve the maximum amount of memory this domain is allowed to access.
  * Note that the current amount of memory this domain is allowed to access may
  * be different (see dom.memory_set).
@@ -1019,7 +1020,7 @@ static VALUE libvirt_domain_max_memory(VALUE d)
  * call-seq:
  *   dom.max_memory = Fixnum
  *
- * Call virDomainSetMaxMemory[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetMaxMemory]
+ * Call virDomainSetMaxMemory[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMaxMemory]
  * to set the maximum amount of memory (in kilobytes) this domain should be
  * allowed to access.
  */
@@ -1040,7 +1041,7 @@ static VALUE libvirt_domain_max_memory_equal(VALUE d, VALUE max_memory)
  * call-seq:
  *   dom.memory = Fixnum,flags=0
  *
- * Call virDomainSetMemory[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetMemory]
+ * Call virDomainSetMemory[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMemory]
  * to set the amount of memory (in kilobytes) this domain should currently
  * have.  Note this will only succeed if both the hypervisor and the domain on
  * this connection support ballooning.
@@ -1070,9 +1071,9 @@ static VALUE libvirt_domain_memory_equal(VALUE d, VALUE in)
 
 /*
  * call-seq:
- *   dom.max_vcpus -> fixnum
+ *   dom.max_vcpus -> Fixnum
  *
- * Call virDomainGetMaxVcpus[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetMaxVcpus]
+ * Call virDomainGetMaxVcpus[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMaxVcpus]
  * to retrieve the maximum number of virtual CPUs this domain can use.
  */
 static VALUE libvirt_domain_max_vcpus(VALUE d)
@@ -1084,9 +1085,9 @@ static VALUE libvirt_domain_max_vcpus(VALUE d)
 
 #if HAVE_VIRDOMAINGETVCPUSFLAGS
 /* call-seq:
- *   dom.num_vcpus(flags) -> fixnum
+ *   dom.num_vcpus(flags) -> Fixnum
  *
- * Call virDomainGetVcpusFlags[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetVcpusFlags]
+ * Call virDomainGetVcpusFlags[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpusFlags]
  * to retrieve the number of virtual CPUs assigned to this domain.
  */
 static VALUE libvirt_domain_num_vcpus(VALUE d, VALUE flags)
@@ -1102,7 +1103,7 @@ static VALUE libvirt_domain_num_vcpus(VALUE d, VALUE flags)
  * call-seq:
  *   dom.vcpus = Fixnum,flags=0
  *
- * Call virDomainSetVcpus[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetVcpus]
+ * Call virDomainSetVcpus[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetVcpus]
  * to set the current number of virtual CPUs this domain should have.  Note
  * that this will only work if both the hypervisor and domain on this
  * connection support virtual CPU hotplug/hot-unplug.
@@ -1152,7 +1153,7 @@ static VALUE libvirt_domain_vcpus_equal(VALUE d, VALUE in)
  *   dom.vcpus_flags = Fixnum,flags=0
  *
 
- * Call virDomainSetVcpusFlags[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetVcpusFlags]
+ * Call virDomainSetVcpusFlags[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetVcpusFlags]
  * to set the current number of virtual CPUs this domain should have.  The
  * flags parameter controls whether the change is made to the running domain
  * the domain configuration, or both, and must not be 0.  Deprecated;
@@ -1175,7 +1176,7 @@ static VALUE libvirt_domain_vcpus_flags_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.pin_vcpu(vcpu, cpulist, flags=0) -> nil
  *
- * Call virDomainPinVcpu[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainPinVcpu]
+ * Call virDomainPinVcpu[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainPinVcpu]
  * to pin a particular virtual CPU to a range of physical processors.  The
  * cpulist should be an array of Fixnums representing the physical processors
  * this virtual CPU should be allowed to be scheduled on.
@@ -1194,7 +1195,7 @@ static VALUE libvirt_domain_pin_vcpu(int argc, VALUE *argv, VALUE d)
 
     cpumaplen = VIR_CPU_MAPLEN(maxcpus);
 
-    cpumap = alloca(cpumaplen);
+    cpumap = alloca(sizeof(unsigned char) * cpumaplen);
     MEMZERO(cpumap, unsigned char, cpumaplen);
 
     for (i = 0; i < RARRAY_LEN(cpulist); i++) {
@@ -1222,9 +1223,9 @@ static VALUE libvirt_domain_pin_vcpu(int argc, VALUE *argv, VALUE d)
 
 /*
  * call-seq:
- *   dom.xml_desc(flags=0) -> string
+ *   dom.xml_desc(flags=0) -> String
  *
- * Call virDomainGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetXMLDesc]
+ * Call virDomainGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetXMLDesc]
  * to retrieve the XML describing this domain.
  */
 static VALUE libvirt_domain_xml_desc(int argc, VALUE *argv, VALUE d)
@@ -1243,7 +1244,7 @@ static VALUE libvirt_domain_xml_desc(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.undefine(flags=0) -> nil
  *
- * Call virDomainUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainUndefine]
+ * Call virDomainUndefine[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainUndefine]
  * to undefine the domain.  After this call, the domain object is no longer
  * valid.
  */
@@ -1273,7 +1274,7 @@ static VALUE libvirt_domain_undefine(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.create(flags=0) -> nil
  *
- * Call virDomainCreate[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCreate]
+ * Call virDomainCreate[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreate]
  * to start an already defined domain.
  */
 static VALUE libvirt_domain_create(int argc, VALUE *argv, VALUE d)
@@ -1300,7 +1301,7 @@ static VALUE libvirt_domain_create(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.autostart -> [true|false]
  *
- * Call virDomainGetAutostart[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetAutostart]
+ * Call virDomainGetAutostart[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetAutostart]
  * to find out the state of the autostart flag for a domain.
  */
 static VALUE libvirt_domain_autostart(VALUE d)
@@ -1318,7 +1319,7 @@ static VALUE libvirt_domain_autostart(VALUE d)
  * call-seq:
  *   dom.autostart = [true|false]
  *
- * Call virDomainSetAutostart[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetAutostart]
+ * Call virDomainSetAutostart[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetAutostart]
  * to make this domain autostart when libvirtd starts up.
  */
 static VALUE libvirt_domain_autostart_equal(VALUE d, VALUE autostart)
@@ -1338,7 +1339,7 @@ static VALUE libvirt_domain_autostart_equal(VALUE d, VALUE autostart)
  * call-seq:
  *   dom.attach_device(device_xml, flags=0) -> nil
  *
- * Call virDomainAttachDevice[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainAttachDevice]
+ * Call virDomainAttachDevice[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainAttachDevice]
  * to attach the device described by the device_xml to the domain.
  */
 static VALUE libvirt_domain_attach_device(int argc, VALUE *argv, VALUE d)
@@ -1368,7 +1369,7 @@ static VALUE libvirt_domain_attach_device(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.detach_device(device_xml, flags=0) -> nil
  *
- * Call virDomainDetachDevice[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainDetachDevice]
+ * Call virDomainDetachDevice[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainDetachDevice]
  * to detach the device described by the device_xml from the domain.
  */
 static VALUE libvirt_domain_detach_device(int argc, VALUE *argv, VALUE d)
@@ -1399,7 +1400,7 @@ static VALUE libvirt_domain_detach_device(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.update_device(device_xml, flags=0) -> nil
  *
- * Call virDomainUpdateDeviceFlags[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainUpdateDeviceFlags]
+ * Call virDomainUpdateDeviceFlags[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainUpdateDeviceFlags]
  * to update the device described by the device_xml.
  */
 static VALUE libvirt_domain_update_device(int argc, VALUE *argv, VALUE d)
@@ -1420,7 +1421,7 @@ static VALUE libvirt_domain_update_device(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.free -> nil
  *
- * Call virDomainFree[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainFree]
+ * Call virDomainFree[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainFree]
  * to free a domain object.
  */
 static VALUE libvirt_domain_free(VALUE d)
@@ -1455,7 +1456,7 @@ static virDomainSnapshotPtr domain_snapshot_get(VALUE d)
  * call-seq:
  *   dom.snapshot_create_xml(snapshot_xml, flags=0) -> Libvirt::Domain::Snapshot
  *
- * Call virDomainSnapshotCreateXML[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotCreateXML]
+ * Call virDomainSnapshotCreateXML[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotCreateXML]
  * to create a new snapshot based on snapshot_xml.
  */
 static VALUE libvirt_domain_snapshot_create_xml(int argc, VALUE *argv, VALUE d)
@@ -1478,9 +1479,9 @@ static VALUE libvirt_domain_snapshot_create_xml(int argc, VALUE *argv, VALUE d)
 
 /*
  * call-seq:
- *   dom.num_of_snapshots(flags=0) -> fixnum
+ *   dom.num_of_snapshots(flags=0) -> Fixnum
  *
- * Call virDomainSnapshotNum[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotNum]
+ * Call virDomainSnapshotNum[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotNum]
  * to retrieve the number of available snapshots for this domain.
  */
 static VALUE libvirt_domain_num_of_snapshots(int argc, VALUE *argv, VALUE d)
@@ -1499,7 +1500,7 @@ static VALUE libvirt_domain_num_of_snapshots(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.list_snapshots(flags=0) -> list
  *
- * Call virDomainSnapshotListNames[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListNames]
+ * Call virDomainSnapshotListNames[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotListNames]
  * to retrieve a list of snapshot names available for this domain.
  */
 static VALUE libvirt_domain_list_snapshots(int argc, VALUE *argv, VALUE d)
@@ -1539,7 +1540,7 @@ static VALUE libvirt_domain_list_snapshots(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.lookup_snapshot_by_name(name, flags=0) -> Libvirt::Domain::Snapshot
  *
- * Call virDomainSnapshotLookupByName[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotLookupByName]
+ * Call virDomainSnapshotLookupByName[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotLookupByName]
  * to retrieve a snapshot object corresponding to snapshot name.
  */
 static VALUE libvirt_domain_lookup_snapshot_by_name(int argc, VALUE *argv,
@@ -1564,7 +1565,7 @@ static VALUE libvirt_domain_lookup_snapshot_by_name(int argc, VALUE *argv,
  * call-seq:
  *   dom.has_current_snapshot?(flags=0) -> [true|false]
  *
- * Call virDomainHasCurrentSnapshot[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainHasCurrentSnapshot]
+ * Call virDomainHasCurrentSnapshot[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainHasCurrentSnapshot]
  * to find out if this domain has a snapshot active.
  */
 static VALUE libvirt_domain_has_current_snapshot_p(int argc, VALUE *argv,
@@ -1584,7 +1585,7 @@ static VALUE libvirt_domain_has_current_snapshot_p(int argc, VALUE *argv,
  * call-seq:
  *   dom.revert_to_snapshot(snapshot_object, flags=0) -> nil
  *
- * Call virDomainRevertToSnapshot[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainRevertToSnapshot]
+ * Call virDomainRevertToSnapshot[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainRevertToSnapshot]
  * to restore this domain to a previously saved snapshot.
  */
 static VALUE libvirt_domain_revert_to_snapshot(int argc, VALUE *argv, VALUE d)
@@ -1603,7 +1604,7 @@ static VALUE libvirt_domain_revert_to_snapshot(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.current_snapshot(flags=0) -> Libvirt::Domain::Snapshot
  *
- * Call virDomainCurrentSnapshot[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCurrentSnapshot]
+ * Call virDomainCurrentSnapshot[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCurrentSnapshot]
  * to retrieve the current snapshot for this domain (if any).
  */
 static VALUE libvirt_domain_current_snapshot(int argc, VALUE *argv, VALUE d)
@@ -1624,9 +1625,9 @@ static VALUE libvirt_domain_current_snapshot(int argc, VALUE *argv, VALUE d)
 
 /*
  * call-seq:
- *   snapshot.xml_desc(flags=0) -> string
+ *   snapshot.xml_desc(flags=0) -> String
  *
- * Call virDomainSnapshotGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotGetXMLDesc]
+ * Call virDomainSnapshotGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotGetXMLDesc]
  * to retrieve the xml description for this snapshot.
  */
 static VALUE libvirt_domain_snapshot_xml_desc(int argc, VALUE *argv, VALUE s)
@@ -1645,7 +1646,7 @@ static VALUE libvirt_domain_snapshot_xml_desc(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   snapshot.delete(flags=0) -> nil
  *
- * Call virDomainSnapshotDelete[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotDelete]
+ * Call virDomainSnapshotDelete[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotDelete]
  * to delete this snapshot.
  */
 static VALUE libvirt_domain_snapshot_delete(int argc, VALUE *argv, VALUE s)
@@ -1664,7 +1665,7 @@ static VALUE libvirt_domain_snapshot_delete(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   snapshot.free -> nil
  *
- * Call virDomainSnapshotFree[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotFree]
+ * Call virDomainSnapshotFree[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotFree]
  * to free up the snapshot object.  After this call the snapshot object is
  * no longer valid.
  */
@@ -1678,9 +1679,9 @@ static VALUE libvirt_domain_snapshot_free(VALUE s)
 #if HAVE_VIRDOMAINSNAPSHOTGETNAME
 /*
  * call-seq:
- *   snapshot.name -> string
+ *   snapshot.name -> String
  *
- * Call virDomainSnapshotGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotGetName]
+ * Call virDomainSnapshotGetName[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotGetName]
  * to get the name associated with a snapshot.
  */
 static VALUE libvirt_domain_snapshot_name(VALUE s)
@@ -1697,7 +1698,7 @@ static VALUE libvirt_domain_snapshot_name(VALUE s)
  * call-seq:
  *   dom.job_info -> Libvirt::Domain::JobInfo
  *
- * Call virDomainGetJobInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetJobInfo]
+ * Call virDomainGetJobInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo]
  * to retrieve the current state of the running domain job.
  */
 static VALUE libvirt_domain_job_info(VALUE d)
@@ -1731,7 +1732,7 @@ static VALUE libvirt_domain_job_info(VALUE d)
  * call-seq:
  *   dom.abort_job -> nil
  *
- * Call virDomainAbortJob[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainAbortJob]
+ * Call virDomainAbortJob[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainAbortJob]
  * to abort the currently running job on this domain.
  */
 static VALUE libvirt_domain_abort_job(VALUE d)
@@ -1766,7 +1767,7 @@ static VALUE create_sched_type_array(VALUE input)
  * call-seq:
  *   dom.scheduler_type -> [type, #params]
  *
- * Call virDomainGetSchedulerType[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetSchedulerType]
+ * Call virDomainGetSchedulerType[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSchedulerType]
  * to retrieve the scheduler type used on this domain.
  */
 static VALUE libvirt_domain_scheduler_type(VALUE d)
@@ -1796,7 +1797,7 @@ static VALUE libvirt_domain_scheduler_type(VALUE d)
 #if HAVE_VIRDOMAINQEMUMONITORCOMMAND
 /*
  * call-seq:
- *   dom.qemu_monitor_command(cmd, flags=0) -> string
+ *   dom.qemu_monitor_command(cmd, flags=0) -> String
  *
  * Call virDomainQemuMonitorCommand
  * to send a qemu command directly to the monitor.  Note that this will only
@@ -1816,7 +1817,11 @@ static VALUE libvirt_domain_qemu_monitor_command(int argc, VALUE *argv, VALUE d)
     type = virConnectGetType(ruby_libvirt_connect_get(d));
     ruby_libvirt_raise_error_if(type == NULL, e_Error, "virConnectGetType",
                                 ruby_libvirt_connect_get(d));
-    if (strcmp(type, "QEMU") != 0) {
+    /* The type != NULL check is actually redundant, since if type was NULL
+     * we would have raised an exception above.  It's here to shut clang,
+     * since clang can't tell that we would never reach this.
+     */
+    if (type != NULL && strcmp(type, "QEMU") != 0) {
         rb_raise(rb_eTypeError,
                  "Tried to use virDomainQemuMonitor command on %s connection",
                  type);
@@ -1844,7 +1849,7 @@ static VALUE libvirt_domain_qemu_monitor_command(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.updated? ->  [True|False]
  *
- * Call virDomainIsUpdated[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainIsUpdated]
+ * Call virDomainIsUpdated[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsUpdated]
  * to determine whether the definition for this domain has been updated.
  */
 static VALUE libvirt_domain_is_updated(VALUE d)
@@ -1924,7 +1929,7 @@ static const char *scheduler_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.scheduler_parameters(flags=0) -> Hash
  *
- * Call virDomainGetSchedulerParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetSchedulerParameters]
+ * Call virDomainGetSchedulerParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSchedulerParameters]
  * to retrieve all of the scheduler parameters for this domain.  The keys and
  * values in the hash that is returned are hypervisor specific.
  */
@@ -1944,12 +1949,8 @@ 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},
@@ -1961,7 +1962,7 @@ static struct ruby_libvirt_typed_param domain_scheduler_allowed[] = {
  * call-seq:
  *   dom.scheduler_parameters = Hash
  *
- * Call virDomainSetSchedulerParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetSchedulerParameters]
+ * Call virDomainSetSchedulerParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetSchedulerParameters]
  * to set the scheduler parameters for this domain.  The keys and values in
  * the input hash are hypervisor specific.  If an empty hash is given, no
  * changes are made (and no error is raised).
@@ -2032,7 +2033,7 @@ static const char *memory_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.memory_parameters(flags=0) -> Hash
  *
- * Call virDomainGetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetMemoryParameters]
+ * Call virDomainGetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMemoryParameters]
  * to retrieve all of the memory parameters for this domain.  The keys and
  * values in the hash that is returned are hypervisor specific.
  */
@@ -2058,7 +2059,7 @@ static struct ruby_libvirt_typed_param domain_memory_allowed[] = {
  * call-seq:
  *   dom.memory_parameters = Hash,flags=0
  *
- * Call virDomainSetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetMemoryParameters]
+ * Call virDomainSetMemoryParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMemoryParameters]
  * to set the memory parameters for this domain.  The keys and values in
  * the input hash are hypervisor specific.
  */
@@ -2129,7 +2130,7 @@ static const char *blkio_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.blkio_parameters(flags=0) -> Hash
  *
- * Call virDomainGetBlkioParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetBlkioParameters]
+ * Call virDomainGetBlkioParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlkioParameters]
  * to retrieve all of the blkio parameters for this domain.  The keys and
  * values in the hash that is returned are hypervisor specific.
  */
@@ -2153,7 +2154,7 @@ static struct ruby_libvirt_typed_param blkio_allowed[] = {
  * call-seq:
  *   dom.blkio_parameters = Hash,flags=0
  *
- * Call virDomainSetBlkioParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetBlkioParameters]
+ * Call virDomainSetBlkioParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetBlkioParameters]
  * to set the blkio parameters for this domain.  The keys and values in
  * the input hash are hypervisor specific.
  */
@@ -2175,7 +2176,7 @@ static VALUE libvirt_domain_blkio_parameters_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.state(flags=0) -> state, reason
  *
- * Call virDomainGetState[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetState]
+ * Call virDomainGetState[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetState]
  * to get the current state of the domain.
  */
 static VALUE libvirt_domain_state(int argc, VALUE *argv, VALUE d)
@@ -2204,7 +2205,7 @@ static VALUE libvirt_domain_state(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.open_console(device, stream, flags=0) -> nil
  *
- * Call virDomainOpenConsole[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainOpenConsole]
+ * Call virDomainOpenConsole[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainOpenConsole]
  * to open up a console to device over stream.
  */
 static VALUE libvirt_domain_open_console(int argc, VALUE *argv, VALUE d)
@@ -2227,7 +2228,7 @@ static VALUE libvirt_domain_open_console(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.screenshot(stream, screen, flags=0) -> nil
  *
- * Call virDomainScreenshot[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainScreenshot]
+ * Call virDomainScreenshot[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainScreenshot]
  * to take a screenshot of the domain console as a stream.
  */
 static VALUE libvirt_domain_screenshot(int argc, VALUE *argv, VALUE d)
@@ -2250,7 +2251,7 @@ static VALUE libvirt_domain_screenshot(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.inject_nmi(flags=0) -> nil
  *
- * Call virDomainInjectNMI[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainInjectNMI]
+ * Call virDomainInjectNMI[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainInjectNMI]
  * to send an NMI to the guest.
  */
 static VALUE libvirt_domain_inject_nmi(int argc, VALUE *argv, VALUE d)
@@ -2271,7 +2272,7 @@ static VALUE libvirt_domain_inject_nmi(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.control_info(flags=0) -> Libvirt::Domain::ControlInfo
  *
- * Call virDomainGetControlInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetControlInfo]
+ * Call virDomainGetControlInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetControlInfo]
  * to retrieve domain control interface information.
  */
 static VALUE libvirt_domain_control_info(int argc, VALUE *argv, VALUE d)
@@ -2302,7 +2303,7 @@ static VALUE libvirt_domain_control_info(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.send_key(codeset, holdtime, keycodes)
  *
- * Call virDomainSendKey[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSendKey]
+ * Call virDomainSendKey[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSendKey]
  * to send key(s) to the domain. Keycodes has to be an array of keys to send.
  */
 VALUE libvirt_domain_send_key(VALUE d, VALUE codeset, VALUE holdtime,
@@ -2330,9 +2331,9 @@ VALUE libvirt_domain_send_key(VALUE d, VALUE codeset, VALUE holdtime,
 #if HAVE_VIRDOMAINMIGRATEGETMAXSPEED
 /*
  * call-seq:
- *   dom.migrate_max_speed(flags=0) -> fixnum
+ *   dom.migrate_max_speed(flags=0) -> Fixnum
  *
- * Call virDomainMigrateGetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateGetMaxSpeed]
+ * Call virDomainMigrateGetMaxSpeed[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetMaxSpeed]
  * to retrieve the maximum speed a migration can use.
  */
 static VALUE libvirt_domain_migrate_max_speed(int argc, VALUE *argv, VALUE d)
@@ -2358,7 +2359,7 @@ static VALUE libvirt_domain_migrate_max_speed(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.reset(flags=0) -> nil
  *
- * Call virDomainReset[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainReset]
+ * Call virDomainReset[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainReset]
  * to reset a domain immediately.
  */
 static VALUE libvirt_domain_reset(int argc, VALUE *argv, VALUE d)
@@ -2378,7 +2379,7 @@ static VALUE libvirt_domain_reset(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.hostname(flags=0) -> nil
  *
- * Call virDomainGetHostname[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetHostname]
+ * Call virDomainGetHostname[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetHostname]
  * to get the hostname from a domain.
  */
 static VALUE libvirt_domain_hostname(int argc, VALUE *argv, VALUE d)
@@ -2397,9 +2398,9 @@ static VALUE libvirt_domain_hostname(int argc, VALUE *argv, VALUE d)
 #if HAVE_VIRDOMAINGETMETADATA
 /*
  * call-seq:
- *   dom.metadata(type, uri=nil, flags=0) -> string
+ *   dom.metadata(type, uri=nil, flags=0) -> String
  *
- * Call virDomainGetMetadata[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetMetadata]
+ * Call virDomainGetMetadata[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetMetadata]
  * to get the metadata from a domain.
  */
 static VALUE libvirt_domain_metadata(int argc, VALUE *argv, VALUE d)
@@ -2421,7 +2422,7 @@ static VALUE libvirt_domain_metadata(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.metadata = Fixnum,string/nil,key=nil,uri=nil,flags=0 -> nil
  *
- * Call virDomainSetMetadata[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetMetadata]
+ * Call virDomainSetMetadata[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMetadata]
  * to set the metadata for a domain.
  */
 static VALUE libvirt_domain_metadata_equal(VALUE d, VALUE in)
@@ -2467,7 +2468,7 @@ static VALUE libvirt_domain_metadata_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.send_process_signal(pid, signum, flags=0) -> nil
  *
- * Call virDomainSendProcessSignal[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSendProcessSignal]
+ * Call virDomainSendProcessSignal[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSendProcessSignal]
  * to send a signal to a process inside the domain.
  */
 static VALUE libvirt_domain_send_process_signal(int argc, VALUE *argv, VALUE d)
@@ -2487,9 +2488,9 @@ static VALUE libvirt_domain_send_process_signal(int argc, VALUE *argv, VALUE d)
 #if HAVE_VIRDOMAINLISTALLSNAPSHOTS
 /*
  * call-seq:
- *   dom.list_all_snapshots(flags=0) -> array
+ *   dom.list_all_snapshots(flags=0) -> Array
  *
- * Call virDomainListAllSnapshots[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainListAllSnapshots]
+ * Call virDomainListAllSnapshots[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainListAllSnapshots]
  * to get an array of snapshot objects for all snapshots.
  */
 static VALUE libvirt_domain_list_all_snapshots(int argc, VALUE *argv, VALUE d)
@@ -2505,9 +2506,9 @@ static VALUE libvirt_domain_list_all_snapshots(int argc, VALUE *argv, VALUE d)
 #if HAVE_VIRDOMAINSNAPSHOTNUMCHILDREN
 /*
  * call-seq:
- *   snapshot.num_children(flags=0) -> fixnum
+ *   snapshot.num_children(flags=0) -> Fixnum
  *
- * Call virDomainSnapshotNumChildren[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotNumChildren]
+ * Call virDomainSnapshotNumChildren[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotNumChildren]
  * to get the number of children snapshots of this snapshot.
  */
 static VALUE libvirt_domain_snapshot_num_children(int argc, VALUE *argv,
@@ -2527,18 +2528,18 @@ static VALUE libvirt_domain_snapshot_num_children(int argc, VALUE *argv,
 #if HAVE_VIRDOMAINSNAPSHOTLISTCHILDRENNAMES
 /*
  * call-seq:
- *   snapshot.list_children_names(flags=0) -> array
+ *   snapshot.list_children_names(flags=0) -> Array
  *
- * Call virDomainSnapshotListChildrenNames[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListChildrenNames]
+ * Call virDomainSnapshotListChildrenNames[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotListChildrenNames]
  * to get an array of strings representing the children of this snapshot.
  */
 static VALUE libvirt_domain_snapshot_list_children_names(int argc, VALUE *argv,
                                                          VALUE s)
 {
-    VALUE flags, result, str;
+    VALUE flags, result;
     char **children;
     int num_children, ret, i, j, exception = 0;
-    struct ruby_libvirt_ary_store_arg arg;
+    struct ruby_libvirt_str_new2_and_ary_store_arg arg;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -2564,16 +2565,11 @@ static VALUE libvirt_domain_snapshot_list_children_names(int argc, VALUE *argv,
                                 ruby_libvirt_connect_get(s));
 
     for (i = 0; i < ret; i++) {
-        str = rb_protect(ruby_libvirt_str_new2_wrap, (VALUE)&(children[i]),
-                         &exception);
-        if (exception) {
-            goto error;
-        }
-
         arg.arr = result;
         arg.index = i;
-        arg.elem = str;
-        rb_protect(ruby_libvirt_ary_store_wrap, (VALUE)&arg, &exception);
+        arg.value = children[i];
+        rb_protect(ruby_libvirt_str_new2_and_ary_store_wrap, (VALUE)&arg,
+                   &exception);
         if (exception) {
             goto error;
         }
@@ -2596,9 +2592,9 @@ error:
 #if HAVE_VIRDOMAINSNAPSHOTLISTALLCHILDREN
 /*
  * call-seq:
- *   snapshot.list_all_children(flags=0) -> array
+ *   snapshot.list_all_children(flags=0) -> Array
  *
- * Call virDomainSnapshotListAllChildren[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListAllChildren]
+ * Call virDomainSnapshotListAllChildren[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotListAllChildren]
  * to get an array of snapshot objects that are children of this snapshot.
  */
 static VALUE libvirt_domain_snapshot_list_all_children(int argc, VALUE *argv,
@@ -2617,7 +2613,7 @@ static VALUE libvirt_domain_snapshot_list_all_children(int argc, VALUE *argv,
  * call-seq:
  *   snapshot.parent(flags=0) -> [Libvirt::Domain::Snapshot|nil]
  *
- * Call virDomainSnapshotGetParent[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotGetParent]
+ * Call virDomainSnapshotGetParent[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotGetParent]
  * to get the parent of this snapshot (nil will be returned if this is a root
  * snapshot).
  */
@@ -2654,7 +2650,7 @@ static VALUE libvirt_domain_snapshot_parent(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   snapshot.current?(flags=0) -> [true|false]
  *
- * Call virDomainSnapshotIsCurrent[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotIsCurrent]
+ * Call virDomainSnapshotIsCurrent[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotIsCurrent]
  * to determine if the snapshot is the domain's current snapshot.
  */
 static VALUE libvirt_domain_snapshot_current_p(int argc, VALUE *argv, VALUE s)
@@ -2675,7 +2671,7 @@ static VALUE libvirt_domain_snapshot_current_p(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   snapshot.has_metadata?(flags=0) -> [true|false]
  *
- * Call virDomainSnapshotHasMetadata[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotHasMetadata]
+ * Call virDomainSnapshotHasMetadata[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSnapshotHasMetadata]
  * to determine if the snapshot is associated with libvirt metadata.
  */
 static VALUE libvirt_domain_snapshot_has_metadata_p(int argc, VALUE *argv,
@@ -2697,7 +2693,7 @@ static VALUE libvirt_domain_snapshot_has_metadata_p(int argc, VALUE *argv,
  * call-seq:
  *   dom.memory_stats_period = Fixnum,flags=0
  *
- * Call virDomainSetMemoryStatsPeriod[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetMemoryStatsPeriod]
+ * Call virDomainSetMemoryStatsPeriod[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetMemoryStatsPeriod]
  * to set the memory statistics collection period.
  */
 static VALUE libvirt_domain_memory_stats_period(VALUE d, VALUE in)
@@ -2719,7 +2715,7 @@ static VALUE libvirt_domain_memory_stats_period(VALUE d, VALUE in)
  * call-seq:
  *   dom.fstrim(mountpoint=nil, minimum=0, flags=0) -> nil
  *
- * Call virDomainFSTrim[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainFSTrim]
+ * Call virDomainFSTrim[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainFSTrim]
  * to call FITRIM within the guest.
  */
 static VALUE libvirt_domain_fstrim(int argc, VALUE *argv, VALUE d)
@@ -2741,7 +2737,7 @@ static VALUE libvirt_domain_fstrim(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.block_rebase(disk, base=nil, bandwidth=0, flags=0) -> nil
  *
- * Call virDomainBlockRebase[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockRebase]
+ * Call virDomainBlockRebase[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockRebase]
  * to populate a disk image with data from its backing image chain.
  */
 static VALUE libvirt_domain_block_rebase(int argc, VALUE *argv, VALUE d)
@@ -2765,7 +2761,7 @@ static VALUE libvirt_domain_block_rebase(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.open_channel(name, stream, flags=0) -> nil
  *
- * Call virDomainOpenChannel[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainOpenChannel]
+ * Call virDomainOpenChannel[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainOpenChannel]
  * to open a channel on a guest.  Note that name may be nil, in which case the
  * first channel on the guest is opened.
  */
@@ -2789,7 +2785,7 @@ static VALUE libvirt_domain_open_channel(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.create_with_files(fds=nil, flags=0) -> nil
  *
- * Call virDomainCreateWithFiles[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCreateWithFiles]
+ * Call virDomainCreateWithFiles[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFiles]
  * to launch a defined domain with a set of open file descriptors.
  */
 static VALUE libvirt_domain_create_with_files(int argc, VALUE *argv, VALUE d)
@@ -2828,7 +2824,7 @@ static VALUE libvirt_domain_create_with_files(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.open_graphics(fd, idx=0, flags=0) -> nil
  *
- * Call virDomainOpenGraphics[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainOpenGraphics]
+ * Call virDomainOpenGraphics[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainOpenGraphics]
  * to connect a file descriptor to the graphics backend of the domain.
  */
 static VALUE libvirt_domain_open_graphics(int argc, VALUE *argv, VALUE d)
@@ -2850,7 +2846,7 @@ static VALUE libvirt_domain_open_graphics(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.pmwakeup(flags=0) -> nil
  *
- * Call virDomainPMWakeup[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainPMWakeup]
+ * Call virDomainPMWakeup[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainPMWakeup]
  * to inject a wakeup into the guest.
  */
 static VALUE libvirt_domain_pmwakeup(int argc, VALUE *argv, VALUE d)
@@ -2871,7 +2867,7 @@ static VALUE libvirt_domain_pmwakeup(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.block_resize(disk, size, flags=0) -> nil
  *
- * Call virDomainBlockResize[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockResize]
+ * Call virDomainBlockResize[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockResize]
  * to resize a block device of domain.
  */
 static VALUE libvirt_domain_block_resize(int argc, VALUE *argv, VALUE d)
@@ -2883,7 +2879,7 @@ static VALUE libvirt_domain_block_resize(int argc, VALUE *argv, VALUE d)
     ruby_libvirt_generate_call_nil(virDomainBlockResize,
                                    ruby_libvirt_connect_get(d),
                                    ruby_libvirt_domain_get(d),
-                                   StringValueCStr(size), NUM2ULL(size),
+                                   StringValueCStr(disk), NUM2ULL(size),
                                    ruby_libvirt_value_to_uint(flags));
 }
 #endif
@@ -2893,7 +2889,7 @@ static VALUE libvirt_domain_block_resize(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.pmsuspend_for_duration(target, duration, flags=0) -> nil
  *
- * Call virDomainPMSuspendForDuration[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainPMSuspendForDuration]
+ * Call virDomainPMSuspendForDuration[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainPMSuspendForDuration]
  * to have the domain enter the target power management suspend level.
  */
 static VALUE libvirt_domain_pmsuspend_for_duration(int argc, VALUE *argv,
@@ -2916,7 +2912,7 @@ static VALUE libvirt_domain_pmsuspend_for_duration(int argc, VALUE *argv,
  * call-seq:
  *   dom.migrate_compression_cache(flags=0) -> Fixnum
  *
- * Call virDomainMigrateGetCompressionCache[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateGetCompressionCache]
+ * Call virDomainMigrateGetCompressionCache[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetCompressionCache]
  * to get the current size of the migration cache.
  */
 static VALUE libvirt_domain_migrate_compression_cache(int argc, VALUE *argv,
@@ -2944,7 +2940,7 @@ static VALUE libvirt_domain_migrate_compression_cache(int argc, VALUE *argv,
  * call-seq:
  *   dom.migrate_compression_cache = Fixnum,flags=0
  *
- * Call virDomainMigrateSetCompressionCache[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateSetCompressionCache]
+ * Call virDomainMigrateSetCompressionCache[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateSetCompressionCache]
  * to set the current size of the migration cache.
  */
 static VALUE libvirt_domain_migrate_compression_cache_equal(VALUE d, VALUE in)
@@ -2966,7 +2962,7 @@ static VALUE libvirt_domain_migrate_compression_cache_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.disk_errors(flags=0) -> Hash
  *
- * Call virDomainGetDiskErrors[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetDiskErrors]
+ * Call virDomainGetDiskErrors[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetDiskErrors]
  * to get errors on disks in the domain.
  */
 static VALUE libvirt_domain_disk_errors(int argc, VALUE *argv, VALUE d)
@@ -3007,7 +3003,7 @@ static VALUE libvirt_domain_disk_errors(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.emulator_pin_info(flags=0) -> Array
  *
- * Call virDomainGetEmulatorPinInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetEmulatorPinInfo]
+ * Call virDomainGetEmulatorPinInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetEmulatorPinInfo]
  * to an array representing the mapping of emulator threads to physical CPUs.
  * For each physical CPU in the machine, the array offset corresponding to that
  * CPU is 'true' if an emulator thread is running on that CPU, and 'false'
@@ -3026,7 +3022,7 @@ static VALUE libvirt_domain_emulator_pin_info(int argc, VALUE *argv, VALUE d)
 
     cpumaplen = VIR_CPU_MAPLEN(maxcpus);
 
-    cpumap = alloca(cpumaplen);
+    cpumap = alloca(sizeof(unsigned char) * cpumaplen);
 
     ret = virDomainGetEmulatorPinInfo(ruby_libvirt_domain_get(d), cpumap,
                                       cpumaplen,
@@ -3051,7 +3047,7 @@ static VALUE libvirt_domain_emulator_pin_info(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.pin_emulator(cpulist, flags=0) -> nil
  *
- * Call virDomainPinVcpu[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainPinVcpu]
+ * Call virDomainPinVcpu[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainPinVcpu]
  * to pin the emulator to a range of physical processors.  The cpulist should
  * be an array of Fixnums representing the physical processors this domain's
  * emulator should be allowed to be scheduled on.
@@ -3070,7 +3066,7 @@ static VALUE libvirt_domain_pin_emulator(int argc, VALUE *argv, VALUE d)
 
     cpumaplen = VIR_CPU_MAPLEN(maxcpus);
 
-    cpumap = alloca(cpumaplen);
+    cpumap = alloca(sizeof(unsigned char) * cpumaplen);
     MEMZERO(cpumap, unsigned char, cpumaplen);
 
     for (i = 0; i < RARRAY_LEN(cpulist); i++) {
@@ -3091,7 +3087,7 @@ static VALUE libvirt_domain_pin_emulator(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.security_label_list -> [ Libvirt::Domain::SecurityLabel ]
  *
- * Call virDomainGetSecurityLabelList[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetSecurityLabelList]
+ * Call virDomainGetSecurityLabelList[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetSecurityLabelList]
  * to retrieve the security labels applied to this domain.
  */
 static VALUE libvirt_domain_security_label_list(VALUE d)
@@ -3142,7 +3138,7 @@ static VALUE params_to_hash(VALUE in)
  * call-seq:
  *   dom.job_stats -> Hash
  *
- * Call virDomainGetJobStats[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetJobStats]
+ * Call virDomainGetJobStats[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobStats]
  * to retrieve information about progress of a background job on a domain.
  */
 static VALUE libvirt_domain_job_stats(int argc, VALUE *argv, VALUE d)
@@ -3238,7 +3234,7 @@ static const char *iotune_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.block_iotune(disk=nil, flags=0) -> Hash
  *
- * Call virDomainGetBlockIoTune[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetBlockIoTune]
+ * Call virDomainGetBlockIoTune[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlockIoTune]
  * to retrieve all of the block IO tune parameters for this domain.  The keys
  * and values in the hash that is returned are hypervisor specific.
  */
@@ -3263,13 +3259,14 @@ static struct ruby_libvirt_typed_param iotune_allowed[] = {
     {VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, VIR_TYPED_PARAM_ULLONG},
     {VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, VIR_TYPED_PARAM_ULLONG},
     {VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, VIR_TYPED_PARAM_ULLONG},
+    {VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC, VIR_TYPED_PARAM_ULLONG},
 };
 
 /*
  * call-seq:
  *   dom.block_iotune = disk,Hash,flags=0
  *
- * Call virDomainSetBlockIoTune[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetBlockIoTune]
+ * Call virDomainSetBlockIoTune[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetBlockIoTune]
  * to set the block IO tune parameters for the supplied disk on this domain.
  * The keys and values in the input hash are hypervisor specific.
  */
@@ -3306,7 +3303,7 @@ static VALUE libvirt_domain_block_iotune_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.block_commit(disk, base=nil, top=nil, bandwidth=0, flags=0) -> nil
  *
- * Call virDomainBlockCommit[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockCommit]
+ * Call virDomainBlockCommit[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockCommit]
  * to commit changes from a top-level backing file into a lower level base file.
  */
 static VALUE libvirt_domain_block_commit(int argc, VALUE *argv, VALUE d)
@@ -3331,12 +3328,12 @@ static VALUE libvirt_domain_block_commit(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.block_pull(disk, bandwidth=0, flags=0) -> nil
  *
- * Call virDomainBlockPull[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockPull]
+ * Call virDomainBlockPull[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockPull]
  * to pull changes from a backing file into a disk image.
  */
 static VALUE libvirt_domain_block_pull(int argc, VALUE *argv, VALUE d)
 {
-    VALUE disk, bandwidth, flags;
+    VALUE disk, bandwidth = RUBY_Qnil, flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "12", &disk, &bandwidth, &flags);
 
@@ -3354,7 +3351,7 @@ static VALUE libvirt_domain_block_pull(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.block_job_speed = disk,bandwidth=0,flags=0
  *
- * Call virDomainBlockJobSetSpeed[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockJobSetSpeed]
+ * Call virDomainBlockJobSetSpeed[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockJobSetSpeed]
  * to set the maximum allowable bandwidth a block job may consume.
  */
 static VALUE libvirt_domain_block_job_speed_equal(VALUE d, VALUE in)
@@ -3400,12 +3397,12 @@ static VALUE libvirt_domain_block_job_speed_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.block_job_info(disk, flags=0) -> Libvirt::Domain::BlockJobInfo
  *
- * Call virDomainGetBlockJobInfo[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetBlockJobInfo]
+ * Call virDomainGetBlockJobInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlockJobInfo]
  * to get block job information for a given disk.
  */
 static VALUE libvirt_domain_block_job_info(int argc, VALUE *argv, VALUE d)
 {
-    VALUE disk, flags, result;
+    VALUE disk, flags = RUBY_Qnil, result;
     virDomainBlockJobInfo info;
     int r;
 
@@ -3435,12 +3432,12 @@ static VALUE libvirt_domain_block_job_info(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.block_job_abort(disk, flags=0) -> nil
  *
- * Call virDomainBlockJobAbort[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainBlockJobAbort]
+ * Call virDomainBlockJobAbort[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockJobAbort]
  * to cancel an active block job on the given disk.
  */
 static VALUE libvirt_domain_block_job_abort(int argc, VALUE *argv, VALUE d)
 {
-    VALUE disk, flags;
+    VALUE disk, flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "11", &disk, &flags);
 
@@ -3500,13 +3497,13 @@ static const char *interface_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.interface_parameters(interface, flags=0) -> Hash
  *
- * Call virDomainGetInterfaceParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetInterfaceParameters]
+ * Call virDomainGetInterfaceParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetInterfaceParameters]
  * to retrieve the interface parameters for the given interface on this domain.
  * The keys and values in the hash that is returned are hypervisor specific.
  */
 static VALUE libvirt_domain_interface_parameters(int argc, VALUE *argv, VALUE d)
 {
-    VALUE device, flags;
+    VALUE device = RUBY_Qnil, flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "11", &device, &flags);
 
@@ -3531,7 +3528,7 @@ static struct ruby_libvirt_typed_param interface_allowed[] = {
  * call-seq:
  *   dom.interface_parameters = device,Hash,flags=0
  *
- * Call virDomainSetInterfaceParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetInterfaceParameters]
+ * Call virDomainSetInterfaceParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceParameters]
  * to set the interface parameters for the supplied device on this domain.
  * The keys and values in the input hash are hypervisor specific.
  */
@@ -3597,13 +3594,13 @@ static const char *block_stats_get(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.block_stats_flags(disk, flags=0) -> Hash
  *
- * Call virDomainGetBlockStatsFlags[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetBlockStatsFlags]
+ * Call virDomainGetBlockStatsFlags[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlockStatsFlags]
  * to retrieve the block statistics for the given disk on this domain.
  * The keys and values in the hash that is returned are hypervisor specific.
  */
 static VALUE libvirt_domain_block_stats_flags(int argc, VALUE *argv, VALUE d)
 {
-    VALUE disk, flags;
+    VALUE disk = RUBY_Qnil, flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "11", &disk, &flags);
 
@@ -3658,13 +3655,13 @@ static const char *numa_set(VALUE d, unsigned int flags,
  * call-seq:
  *   dom.numa_parameters(flags=0) -> Hash
  *
- * Call virDomainGetNumaParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetNumaParameters]
+ * Call virDomainGetNumaParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetNumaParameters]
  * to retrieve the numa parameters for this domain.  The keys and values in
  * the hash that is returned are hypervisor specific.
  */
 static VALUE libvirt_domain_numa_parameters(int argc, VALUE *argv, VALUE d)
 {
-    VALUE flags;
+    VALUE flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -3682,7 +3679,7 @@ static struct ruby_libvirt_typed_param numa_allowed[] = {
  * call-seq:
  *   dom.numa_parameters = Hash,flags=0
  *
- * Call virDomainSetNumaParameters[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSetNumaParameters]
+ * Call virDomainSetNumaParameters[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetNumaParameters]
  * to set the numa parameters for this domain.  The keys and values in the input
  * hash are hypervisor specific.
  */
@@ -3705,14 +3702,14 @@ static VALUE libvirt_domain_numa_parameters_equal(VALUE d, VALUE in)
  * call-seq:
  *   dom.lxc_open_namespace(flags=0) -> Array
  *
- * Call virDomainLxcOpenNamespace[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainLxcOpenNamespace]
+ * Call virDomainLxcOpenNamespace[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainLxcOpenNamespace]
  * to open an LXC namespace.  Note that this will only work on connections to
  * the LXC driver.  The call will return an array of open file descriptors;
  * these should be closed when use of them is finished.
  */
 static VALUE libvirt_domain_lxc_open_namespace(int argc, VALUE *argv, VALUE d)
 {
-    VALUE flags, result;
+    VALUE flags = RUBY_Qnil, result;
     int *fdlist = NULL;
     int ret, i, exception = 0;
     struct ruby_libvirt_ary_store_arg args;
@@ -3762,17 +3759,21 @@ error:
  * call-seq:
  *   dom.qemu_agent_command(command, timeout=0, flags=0) -> String
  *
- * Call virDomainQemuAgentCommand[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainQemuAgentCommand]
+ * Call virDomainQemuAgentCommand[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainQemuAgentCommand]
  * to run an arbitrary command on the Qemu Agent.
  */
 static VALUE libvirt_domain_qemu_agent_command(int argc, VALUE *argv, VALUE d)
 {
-    VALUE command, timeout, flags, result;
+    VALUE command, timeout = RUBY_Qnil, flags = RUBY_Qnil, result;
     char *ret;
     int exception = 0;
 
     rb_scan_args(argc, argv, "12", &command, &timeout, &flags);
 
+    if (NIL_P(timeout)) {
+        timeout = INT2NUM(VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT);
+    }
+
     ret = virDomainQemuAgentCommand(ruby_libvirt_domain_get(d),
                                     StringValueCStr(command),
                                     ruby_libvirt_value_to_int(timeout),
@@ -3796,7 +3797,7 @@ static VALUE libvirt_domain_qemu_agent_command(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.lxc_enter_namespace(fds, flags=0) -> Array
  *
- * Call virDomainLxcEnterNamespace[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainLxcEnterNamespace]
+ * Call virDomainLxcEnterNamespace[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainLxcEnterNamespace]
  * to attach the process to the namespaces associated with the file descriptors
  * in the fds array.  Note that this call does not actually enter the namespace;
  * the next call to fork will do that.  Also note that this function will return
@@ -3805,7 +3806,7 @@ static VALUE libvirt_domain_qemu_agent_command(int argc, VALUE *argv, VALUE d)
  */
 static VALUE libvirt_domain_lxc_enter_namespace(int argc, VALUE *argv, VALUE d)
 {
-    VALUE fds, flags, result;
+    VALUE fds = RUBY_Qnil, flags = RUBY_Qnil, result;
     int *fdlist;
     int ret, exception = 0;
     int *oldfdlist;
@@ -3864,22 +3865,20 @@ 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
 };
 
 /*
  * call-seq:
  *   dom.migrate3(dconn, Hash=nil, flags=0) -> Libvirt::Domain
  *
- * Call virDomainMigrate3[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrate2]
+ * Call virDomainMigrate3[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrate3]
  * to migrate a domain from the host on this connection to the connection
  * referenced in dconn.
  */
 static VALUE libvirt_domain_migrate3(int argc, VALUE *argv, VALUE d)
 {
-    VALUE dconn, hash, flags;
+    VALUE dconn = RUBY_Qnil, hash = RUBY_Qnil, flags = RUBY_Qnil;
     virDomainPtr ddom = NULL;
     struct ruby_libvirt_parameter_assign_args args;
     unsigned long hashsize;
@@ -3917,13 +3916,13 @@ static VALUE libvirt_domain_migrate3(int argc, VALUE *argv, VALUE d)
  * call-seq:
  *   dom.migrate_to_uri3(duri=nil, Hash=nil, flags=0) -> nil
  *
- * Call virDomainMigrateToURI3[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI3]
+ * Call virDomainMigrateToURI3[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateToURI3]
  * to migrate a domain from the host on this connection to the host whose
  * libvirt URI is duri.
  */
 static VALUE libvirt_domain_migrate_to_uri3(int argc, VALUE *argv, VALUE d)
 {
-    VALUE duri, hash, flags;
+    VALUE duri = RUBY_Qnil, hash = RUBY_Qnil, flags = RUBY_Qnil;
     struct ruby_libvirt_parameter_assign_args args;
     unsigned long hashsize;
 
@@ -3955,12 +3954,12 @@ static VALUE libvirt_domain_migrate_to_uri3(int argc, VALUE *argv, VALUE d)
 }
 #endif
 
-#if HAVE_VIRNODEGETCPUSTATS
+#if HAVE_VIRDOMAINGETCPUSTATS
 /*
  * call-seq:
  *   dom.cpu_stats(start_cpu=-1, numcpus=1, flags=0) -> Hash
  *
- * Call virDomainGetCPUStats[http://www.libvirt.org/html/libvirt-libvirt.html#virDomainGetCPUStats]
+ * Call virDomainGetCPUStats[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetCPUStats]
  * to get statistics about CPU usage attributable to a single domain.  If
  * start_cpu is -1, then numcpus must be 1 and statistics attributable to the
  * entire domain is returned.  If start_cpu is any positive number, then it
@@ -3969,7 +3968,7 @@ static VALUE libvirt_domain_migrate_to_uri3(int argc, VALUE *argv, VALUE d)
  */
 static VALUE libvirt_domain_cpu_stats(int argc, VALUE *argv, VALUE d)
 {
-    VALUE start_cpu, numcpus, flags, result, tmp;
+    VALUE start_cpu = RUBY_Qnil, numcpus = RUBY_Qnil, flags = RUBY_Qnil, result, tmp;
     int ret, nparams, j;
     unsigned int i;
     virTypedParameterPtr params;
@@ -4048,6 +4047,297 @@ static VALUE libvirt_domain_cpu_stats(int argc, VALUE *argv, VALUE d)
 }
 #endif
 
+#if HAVE_VIRDOMAINGETTIME
+/*
+ * call-seq:
+ *   dom.time(flags=0) -> Hash
+ * Call virDomainGetTime[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetTime]
+ * to get information about the guest time.
+ */
+static VALUE libvirt_domain_get_time(int argc, VALUE *argv, VALUE d)
+{
+    VALUE flags = RUBY_Qnil, result;
+    long long seconds;
+    unsigned int nseconds;
+    int ret;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    ret = virDomainGetTime(ruby_libvirt_domain_get(d), &seconds, &nseconds,
+                           ruby_libvirt_value_to_uint(flags));
+    ruby_libvirt_raise_error_if(ret < 0, e_Error, "virDomainGetTime",
+                                ruby_libvirt_connect_get(d));
+
+    result = rb_hash_new();
+    rb_hash_aset(result, rb_str_new2("seconds"), LL2NUM(seconds));
+    rb_hash_aset(result, rb_str_new2("nseconds"), UINT2NUM(nseconds));
+
+    return result;
+}
+#endif
+
+#if HAVE_VIRDOMAINSETTIME
+/*
+ * call-seq:
+ *   dom.time = Hash,flags=0
+ * Call virDomainSetTime[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetTime]
+ * to set guest time.
+ */
+static VALUE libvirt_domain_time_equal(VALUE d, VALUE in)
+{
+    VALUE hash, flags, seconds, nseconds;
+
+    ruby_libvirt_assign_hash_and_flags(in, &hash, &flags);
+
+    seconds = rb_hash_aref(hash, rb_str_new2("seconds"));
+    nseconds = rb_hash_aref(hash, rb_str_new2("nseconds"));
+
+    ruby_libvirt_generate_call_nil(virDomainSetTime,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   NUM2LL(seconds), NUM2UINT(nseconds),
+                                   NUM2UINT(flags));
+}
+#endif
+
+#if HAVE_VIRDOMAINCOREDUMPWITHFORMAT
+/*
+ * call-seq:
+ *   dom.core_dump_with_format(filename, dumpformat, flags=0) -> nil
+ *
+ * Call virDomainCoreDumpWithFormat[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainCoreDump]
+ * to do a full memory dump of the domain to filename.
+ */
+static VALUE libvirt_domain_core_dump_with_format(int argc, VALUE *argv, VALUE d)
+{
+    VALUE to, dumpformat = RUBY_Qnil, flags = RUBY_Qnil;
+
+    rb_scan_args(argc, argv, "21", &to, &dumpformat, &flags);
+
+    ruby_libvirt_generate_call_nil(virDomainCoreDumpWithFormat,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   StringValueCStr(to),
+                                   NUM2UINT(dumpformat),
+                                   ruby_libvirt_value_to_uint(flags));
+}
+#endif
+
+#if HAVE_VIRDOMAINFSFREEZE
+/*
+ * call-seq:
+ *   dom.fs_freeze(mountpoints=nil, flags=0) -> Fixnum
+ *
+ * Call virDomainFSFreeze[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainFSFreeze]
+ * to freeze the specified filesystems within the guest.
+ */
+static VALUE libvirt_domain_fs_freeze(int argc, VALUE *argv, VALUE d)
+{
+    VALUE mountpoints = RUBY_Qnil, flags = RUBY_Qnil, entry;
+    const char **mnt;
+    unsigned int nmountpoints;
+    int i;
+
+    rb_scan_args(argc, argv, "02", &mountpoints, &flags);
+
+    if (NIL_P(mountpoints)) {
+        mnt = NULL;
+        nmountpoints = 0;
+    }
+    else {
+        Check_Type(mountpoints, T_ARRAY);
+
+        nmountpoints = RARRAY_LEN(mountpoints);
+        mnt = alloca(nmountpoints * sizeof(char *));
+
+        for (i = 0; i < nmountpoints; i++) {
+            entry = rb_ary_entry(mountpoints, i);
+            mnt[i] = StringValueCStr(entry);
+        }
+    }
+
+    ruby_libvirt_generate_call_int(virDomainFSFreeze,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   mnt, nmountpoints,
+                                   ruby_libvirt_value_to_uint(flags));
+}
+#endif
+
+ #if HAVE_VIRDOMAINFSTHAW
+/*
+ * call-seq:
+ *   dom.fs_thaw(mountpoints=nil, flags=0) -> Fixnum
+ *
+ * Call virDomainFSThaw[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainFSThaw]
+ * to thaw the specified filesystems within the guest.
+ */
+static VALUE libvirt_domain_fs_thaw(int argc, VALUE *argv, VALUE d)
+{
+    VALUE mountpoints = RUBY_Qnil, flags = RUBY_Qnil, entry;
+    const char **mnt;
+    unsigned int nmountpoints;
+    int i;
+
+    rb_scan_args(argc, argv, "02", &mountpoints, &flags);
+
+    if (NIL_P(mountpoints)) {
+        mnt = NULL;
+        nmountpoints = 0;
+    }
+    else {
+        Check_Type(mountpoints, T_ARRAY);
+
+        nmountpoints = RARRAY_LEN(mountpoints);
+        mnt = alloca(nmountpoints * sizeof(char *));
+
+        for (i = 0; i < nmountpoints; i++) {
+            entry = rb_ary_entry(mountpoints, i);
+            mnt[i] = StringValueCStr(entry);
+        }
+    }
+
+    ruby_libvirt_generate_call_int(virDomainFSThaw,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   mnt, nmountpoints,
+                                   ruby_libvirt_value_to_uint(flags));
+}
+#endif
+
+#if HAVE_VIRDOMAINGETFSINFO
+struct fs_info_arg {
+    virDomainFSInfoPtr *info;
+    int ninfo;
+};
+
+static VALUE fs_info_wrap(VALUE arg)
+{
+    struct fs_info_arg *e = (struct fs_info_arg *)arg;
+    VALUE aliases, entry, result;
+    int i, j;
+
+    result = rb_ary_new2(e->ninfo);
+
+    for (i = 0; i < e->ninfo; i++) {
+        aliases = rb_ary_new2(e->info[i]->ndevAlias);
+        for (j = 0; j < e->info[i]->ndevAlias; j++) {
+            rb_ary_store(aliases, j, rb_str_new2(e->info[i]->devAlias[j]));
+        }
+
+        entry = rb_hash_new();
+        rb_hash_aset(entry, rb_str_new2("mountpoint"),
+                     rb_str_new2(e->info[i]->mountpoint));
+        rb_hash_aset(entry, rb_str_new2("name"),
+                     rb_str_new2(e->info[i]->name));
+        rb_hash_aset(entry, rb_str_new2("fstype"),
+                     rb_str_new2(e->info[i]->fstype));
+        rb_hash_aset(entry, rb_str_new2("aliases"), aliases);
+
+        rb_ary_store(result, i, entry);
+    }
+
+    return result;
+}
+
+/*
+ * call-seq:
+ *   dom.fs_info(flags=0) -> [Hash]
+ *
+ * Call virDomainGetFSInfo[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetFSInfo]
+ * to get information about the guest filesystems.
+ */
+static VALUE libvirt_domain_fs_info(int argc, VALUE *argv, VALUE d)
+{
+    VALUE flags = RUBY_Qnil, result;
+    virDomainFSInfoPtr *info;
+    int ret, i = 0, exception;
+    struct fs_info_arg args;
+
+    rb_scan_args(argc, argv, "01", &flags);
+
+    ret = virDomainGetFSInfo(ruby_libvirt_domain_get(d), &info,
+                             ruby_libvirt_value_to_uint(flags));
+    ruby_libvirt_raise_error_if(ret < 0, e_Error, "virDomainGetFSInfo",
+                                ruby_libvirt_connect_get(d));
+
+    args.info = info;
+    args.ninfo = ret;
+    result = rb_protect(fs_info_wrap, (VALUE)&args, &exception);
+
+    for (i = 0; i < ret; i++) {
+        virDomainFSInfoFree(info[i]);
+    }
+    free(info);
+
+    if (exception) {
+        rb_jump_tag(exception);
+    }
+
+    return result;
+}
+#endif
+
+#if HAVE_VIRDOMAINRENAME
+/*
+ * call-seq:
+ *   dom.rename(name, flags=0) -> nil
+ *
+ * Call virDomainRename[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainRename]
+ * to rename a domain.
+ */
+static VALUE libvirt_domain_rename(int argc, VALUE *argv, VALUE d)
+{
+    VALUE flags = RUBY_Qnil, name;
+
+    rb_scan_args(argc, argv, "11", &name, &flags);
+
+    ruby_libvirt_generate_call_nil(virDomainRename,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   StringValueCStr(name),
+                                   ruby_libvirt_value_to_uint(flags));
+}
+#endif
+
+#if HAVE_VIRDOMAINSETUSERPASSWORD
+/*
+ * call-seq:
+ *   dom.user_password = user,password,flags=0 -> nil
+ *
+ * Call virDomainSetUserPassword[http://www.libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetUserPassword]
+ * to set the user password on a domain.
+ */
+static VALUE libvirt_domain_user_password_equal(VALUE d, VALUE in)
+{
+    VALUE user, password, flags;
+
+    Check_Type(in, T_ARRAY);
+
+    if (RARRAY_LEN(in) == 2) {
+        user = rb_ary_entry(in, 0);
+        password = rb_ary_entry(in, 1);
+        flags = INT2NUM(0);
+    }
+    else if (RARRAY_LEN(in) == 3) {
+        user = rb_ary_entry(in, 0);
+        password = rb_ary_entry(in, 1);
+        flags = rb_ary_entry(in, 2);
+    }
+    else {
+        rb_raise(rb_eArgError, "wrong number of arguments (%ld for 2 or 3)",
+                 RARRAY_LEN(in));
+    }
+
+    ruby_libvirt_generate_call_nil(virDomainSetUserPassword,
+                                   ruby_libvirt_connect_get(d),
+                                   ruby_libvirt_domain_get(d),
+                                   StringValueCStr(user),
+                                   StringValueCStr(password),
+                                   ruby_libvirt_value_to_uint(flags));
+}
+#endif
+
 /*
  * Class Libvirt::Domain
  */
@@ -4115,6 +4405,14 @@ void ruby_libvirt_domain_init(void)
     rb_define_const(c_domain, "MIGRATE_ABORT_ON_ERROR",
                     INT2NUM(VIR_MIGRATE_ABORT_ON_ERROR));
 #endif
+#if HAVE_CONST_VIR_MIGRATE_AUTO_CONVERGE
+    rb_define_const(c_domain, "MIGRATE_AUTO_CONVERGE",
+                    INT2NUM(VIR_MIGRATE_AUTO_CONVERGE));
+#endif
+#if HAVE_CONST_VIR_MIGRATE_RDMA_PIN_ALL
+    rb_define_const(c_domain, "MIGRATE_RDMA_PIN_ALL",
+                    INT2NUM(VIR_MIGRATE_RDMA_PIN_ALL));
+#endif
 
     /* Ideally we would just have the "XML_SECURE" constant.  Unfortunately
      * we screwed up long ago, and we have to leave "DOMAIN_XML_SECURE" for
@@ -4238,7 +4536,10 @@ void ruby_libvirt_domain_init(void)
     rb_define_const(c_domain, "UNDEFINE_SNAPSHOTS_METADATA",
                     INT2NUM(VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA));
 #endif
-
+#if HAVE_CONST_VIR_DOMAIN_UNDEFINE_NVRAM
+    rb_define_const(c_domain, "UNDEFINE_NVRAM",
+                    INT2NUM(VIR_DOMAIN_UNDEFINE_NVRAM));
+#endif
     rb_define_attr(c_domain, "connection", 1, 0);
 
 #if HAVE_CONST_VIR_DOMAIN_SHUTDOWN_DEFAULT
@@ -4260,6 +4561,10 @@ void ruby_libvirt_domain_init(void)
 #if HAVE_CONST_VIR_DOMAIN_SHUTDOWN_SIGNAL
     rb_define_const(c_domain, "SHUTDOWN_SIGNAL",
                     INT2NUM(VIR_DOMAIN_SHUTDOWN_SIGNAL));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_SHUTDOWN_PARAVIRT
+    rb_define_const(c_domain, "SHUTDOWN_PARAVIRT",
+                    INT2NUM(VIR_DOMAIN_SHUTDOWN_PARAVIRT));
 #endif
     rb_define_method(c_domain, "shutdown", libvirt_domain_shutdown, -1);
 
@@ -4282,6 +4587,10 @@ void ruby_libvirt_domain_init(void)
 #if HAVE_CONST_VIR_DOMAIN_REBOOT_SIGNAL
     rb_define_const(c_domain, "REBOOT_SIGNAL",
                     INT2NUM(VIR_DOMAIN_REBOOT_SIGNAL));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_REBOOT_PARAVIRT
+    rb_define_const(c_domain, "REBOOT_PARAVIRT",
+                    INT2NUM(VIR_DOMAIN_REBOOT_PARAVIRT));
 #endif
     rb_define_method(c_domain, "reboot", libvirt_domain_reboot, -1);
 #if HAVE_CONST_VIR_DOMAIN_DESTROY_DEFAULT
@@ -5402,10 +5711,19 @@ void ruby_libvirt_domain_init(void)
     rb_define_method(c_domain, "block_job_speed=",
                      libvirt_domain_block_job_speed_equal, 1);
 #endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES
+    rb_define_const(c_domain, "BLOCK_JOB_SPEED_BANDWIDTH_BYTES",
+                    INT2NUM(VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES));
+#endif
 #if HAVE_VIRDOMAINGETBLOCKJOBINFO
     rb_define_method(c_domain, "block_job_info", libvirt_domain_block_job_info,
                      -1);
 #endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES
+    rb_define_const(c_domain, "BLOCK_JOB_INFO_BANDWIDTH_BYTES",
+                    INT2NUM(VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES));
+#endif
+
 #if HAVE_VIRDOMAINBLOCKJOBABORT
     rb_define_method(c_domain, "block_job_abort",
                      libvirt_domain_block_job_abort, -1);
@@ -5446,6 +5764,10 @@ void ruby_libvirt_domain_init(void)
     rb_define_const(c_domain, "QEMU_AGENT_COMMAND_NOWAIT",
                     INT2NUM(VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT));
 #endif
+#if HAVE_CONST_VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN
+    rb_define_const(c_domain, "QEMU_AGENT_COMMAND_SHUTDOWN",
+                    INT2NUM(VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN));
+#endif
 #if HAVE_CONST_VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT
     rb_define_const(c_domain, "QEMU_MONITOR_COMMAND_DEFAULT",
                     INT2NUM(VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT));
@@ -5471,6 +5793,18 @@ void ruby_libvirt_domain_init(void)
     rb_define_const(c_domain, "BLOCK_COMMIT_DELETE",
                     INT2NUM(VIR_DOMAIN_BLOCK_COMMIT_DELETE));
 #endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_COMMIT_ACTIVE
+    rb_define_const(c_domain, "BLOCK_COMMIT_ACTIVE",
+                    INT2NUM(VIR_DOMAIN_BLOCK_COMMIT_ACTIVE));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_COMMIT_RELATIVE
+    rb_define_const(c_domain, "BLOCK_COMMIT_RELATIVE",
+                    INT2NUM(VIR_DOMAIN_BLOCK_COMMIT_RELATIVE));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES
+    rb_define_const(c_domain, "BLOCK_COMMIT_BANDWIDTH_BYTES",
+                    INT2NUM(VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES));
+#endif
 #if HAVE_CONST_VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN
     rb_define_const(c_domain, "BLOCK_JOB_TYPE_UNKNOWN",
                     INT2NUM(VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN));
@@ -5487,6 +5821,10 @@ void ruby_libvirt_domain_init(void)
     rb_define_const(c_domain, "BLOCK_JOB_TYPE_COMMIT",
                     INT2NUM(VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT));
 #endif
+#if HAVE_CONST_VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT
+    rb_define_const(c_domain, "BLOCK_JOB_TYPE_ACTIVE_COMMIT",
+                    INT2NUM(VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT));
+#endif
 #if HAVE_CONST_VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC
     rb_define_const(c_domain, "BLOCK_JOB_ABORT_ASYNC",
                     INT2NUM(VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC));
@@ -5514,4 +5852,52 @@ void ruby_libvirt_domain_init(void)
 #if HAVE_VIRDOMAINGETCPUSTATS
     rb_define_method(c_domain, "cpu_stats", libvirt_domain_cpu_stats, -1);
 #endif
+#if HAVE_CONST_VIR_DOMAIN_CORE_DUMP_FORMAT_RAW
+    rb_define_const(c_domain, "CORE_DUMP_FORMAT_RAW",
+                    INT2NUM(VIR_DOMAIN_CORE_DUMP_FORMAT_RAW));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB
+    rb_define_const(c_domain, "CORE_DUMP_FORMAT_KDUMP_ZLIB",
+                    INT2NUM(VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_LZO
+    rb_define_const(c_domain, "CORE_DUMP_FORMAT_KDUMP_LZO",
+                    INT2NUM(VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_LZO));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_SNAPPY
+    rb_define_const(c_domain, "CORE_DUMP_FORMAT_KDUMP_SNAPPY",
+                    INT2NUM(VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_SNAPPY));
+#endif
+#if HAVE_VIRDOMAINGETTIME
+    rb_define_method(c_domain, "time", libvirt_domain_get_time, -1);
+#endif
+#if HAVE_VIRDOMAINSETTIME
+    rb_define_method(c_domain, "time=", libvirt_domain_time_equal, 1);
+#endif
+#if HAVE_VIRDOMAINCOREDUMPWITHFORMAT
+    rb_define_method(c_domain, "core_dump_with_format",
+                     libvirt_domain_core_dump_with_format, -1);
+#endif
+#if HAVE_VIRDOMAINFSFREEZE
+    rb_define_method(c_domain, "fs_freeze", libvirt_domain_fs_freeze, -1);
+#endif
+#if HAVE_VIRDOMAINFSTHAW
+    rb_define_method(c_domain, "fs_thaw", libvirt_domain_fs_thaw, -1);
+#endif
+#if HAVE_VIRDOMAINGETFSINFO
+    rb_define_method(c_domain, "fs_info", libvirt_domain_fs_info, -1);
+#endif
+#if HAVE_VIRDOMAINRENAME
+    rb_define_method(c_domain, "rename", libvirt_domain_rename, -1);
+#endif
+#if HAVE_VIRDOMAINSETUSERPASSWORD
+    rb_define_method(c_domain, "user_password=", libvirt_domain_user_password_equal, 1);
+#endif
+#if HAVE_CONST_VIR_DOMAIN_PASSWORD_ENCRYPTED
+    rb_define_const(c_domain, "PASSWORD_ENCRYPTED",
+                    INT2NUM(VIR_DOMAIN_PASSWORD_ENCRYPTED));
+#endif
+#if HAVE_CONST_VIR_DOMAIN_TIME_SYNC
+    rb_define_const(c_domain, "TIME_SYNC", INT2NUM(VIR_DOMAIN_TIME_SYNC));
+#endif
 }