RubyGems - ruby-libvirt - Versions diffs - 0.4.0 → 0.5.0 - Mend

ruby-libvirt 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

data/ext/libvirt/domain.h CHANGED Viewed

@@ -1,9 +1,11 @@
 #ifndef DOMAIN_H
 #define DOMAIN_H
-VALUE domain_new(virDomainPtr d, VALUE conn);
-virDomainPtr domain_get(VALUE s);
+void ruby_libvirt_domain_init(void);
-void init_domain();
+VALUE ruby_libvirt_domain_new(virDomainPtr d, VALUE conn);
+virDomainPtr ruby_libvirt_domain_get(VALUE s);
+extern VALUE c_domain_security_label;
 #endif

data/ext/libvirt/extconf.rb CHANGED Viewed

@@ -1,14 +1,8 @@
 require 'mkmf'
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
-def have_libvirt_funcs(funcs)
-    funcs.each { |f| have_func(f, "libvirt/libvirt.h") }
-end
-def have_libvirt_types(types)
-    types.each { |t| have_type(t, "libvirt/libvirt.h") }
-end
+RbConfig::MAKEFILE_CONFIG['CCDLFLAGS'] = ENV['CFLAGS'] if ENV['CFLAGS']
+RbConfig::MAKEFILE_CONFIG['EXTDLDFLAGS'] = ENV['CFLAGS'] if ENV['CFLAGS']
 # older mkmf does not have checking_message, so implement our own here
 def libvirt_checking_message(target, place = nil, opt = nil)
@@ -42,10 +36,6 @@ SRC
   end
 end
-def have_libvirt_consts(consts)
-  consts.each { |c| have_const(c, ["libvirt/libvirt.h", "libvirt/virterror.h"]) }
-end
 extension_name = '_libvirt'
 # this is a poor-man's dir_config, but is a bit more flexible.  In particular,
@@ -98,6 +88,7 @@ libvirt_types = [ 'virNetworkPtr',
                   'virNodeDevicePtr',
                   'virStreamPtr',
                   'virTypedParameterPtr',
+                  'virDomainBlockJobInfoPtr',
                 ]
 libvirt_funcs = [ 'virStorageVolWipe',
@@ -148,8 +139,92 @@ libvirt_funcs = [ 'virStorageVolWipe',
                   'virInterfaceChangeBegin',
                   'virStorageVolDownload',
                   'virDomainInjectNMI',
+                  'virDomainGetControlInfo',
+                  'virDomainMigrateGetMaxSpeed',
+                  'virNodeGetCPUStats',
+                  'virNodeGetMemoryStats',
+                  'virDomainDestroyFlags',
+                  'virDomainSaveFlags',
+                  'virDomainSaveImageGetXMLDesc',
+                  'virDomainSendKey',
+                  'virNetworkUpdate',
+                  'virNodeSuspendForDuration',
+                  'virNodeGetMemoryParameters',
+                  'virNodeGetCPUMap',
+                  'virDomainUndefineFlags',
+                  'virDomainPinVcpuFlags',
+                  'virDomainGetVcpuPinInfo',
+                  'virDomainSnapshotGetName',
+                  'virConnectSetKeepAlive',
+                  'virDomainReset',
+                  'virDomainShutdownFlags',
+                  'virDomainGetHostname',
+                  'virDomainGetMetadata',
+                  'virDomainSetMetadata',
+                  'virConnectListAllDomains',
+                  'virConnectListAllNetworks',
+                  'virConnectListAllInterfaces',
+                  'virConnectListAllSecrets',
+                  'virConnectListAllNodeDevices',
+                  'virConnectListAllStoragePools',
+                  'virConnectListAllNWFilters',
+                  'virConnectIsAlive',
+                  'virNodeDeviceDetachFlags',
+                  'virDomainSendProcessSignal',
+                  'virDomainListAllSnapshots',
+                  'virDomainSnapshotNumChildren',
+                  'virDomainSnapshotListChildrenNames',
+                  'virDomainSnapshotListAllChildren',
+                  'virDomainSnapshotGetParent',
+                  'virDomainSnapshotIsCurrent',
+                  'virDomainSnapshotHasMetadata',
+                  'virDomainSetMemoryStatsPeriod',
+                  'virDomainFSTrim',
+                  'virDomainBlockRebase',
+                  'virDomainOpenChannel',
+                  'virNodeDeviceLookupSCSIHostByWWN',
+                  'virStorageVolWipePattern',
+                  'virStoragePoolListAllVolumes',
+                  'virDomainCreateWithFiles',
+                  'virDomainCreateXMLWithFiles',
+                  'virDomainOpenGraphics',
+                  'virStorageVolResize',
+                  'virDomainPMWakeup',
+                  'virDomainBlockResize',
+                  'virDomainPMSuspendForDuration',
+                  'virDomainMigrateGetCompressionCache',
+                  'virDomainMigrateSetCompressionCache',
+                  'virDomainGetDiskErrors',
+                  'virDomainGetEmulatorPinInfo',
+                  'virDomainPinEmulator',
+                  'virDomainGetSecurityLabelList',
+                  'virDomainGetJobStats',
+                  'virDomainGetBlockIoTune',
+                  'virDomainSetBlockIoTune',
+                  'virDomainBlockCommit',
+                  'virDomainBlockPull',
+                  'virDomainBlockJobSetSpeed',
+                  'virDomainGetBlockJobInfo',
+                  'virDomainBlockJobAbort',
+                  'virDomainGetInterfaceParameters',
+                  'virDomainBlockStatsFlags',
+                  'virDomainGetNumaParameters',
+                  'virConnectGetCPUModelNames',
+                  'virDomainMigrate3',
+                  'virDomainGetCPUStats',
                 ]
+libvirt_qemu_funcs = [ 'virDomainQemuMonitorCommand',
+                       'virDomainQemuAttach',
+                       'virDomainQemuAgentCommand'
+                     ]
+libvirt_lxc_funcs = [
+                     'virDomainLxcOpenNamespace',
+                     'virDomainLxcEnterNamespace',
+                     'virDomainLxcEnterSecurityLabel',
+                    ]
 libvirt_consts = [ 'VIR_MIGRATE_LIVE',
                    'VIR_MIGRATE_PEER2PEER',
                    'VIR_MIGRATE_TUNNELLED',
@@ -178,44 +253,203 @@ libvirt_consts = [ 'VIR_MIGRATE_LIVE',
                    'VIR_DOMAIN_EVENT_ID_REBOOT',
                    'VIR_DOMAIN_EVENT_ID_RTC_CHANGE',
                    'VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON',
-                   'VIR_FROM_VMWARE',
-                   'VIR_FROM_AUDIT',
-                   'VIR_FROM_SYSINFO',
-                   'VIR_FROM_STREAMS',
-                   'VIR_FROM_XENAPI',
-                   'VIR_FROM_HOOK',
-                   'VIR_ERR_HOOK_SCRIPT_FAILED',
-                   'VIR_ERR_MIGRATE_PERSIST_FAILED',
-                   'VIR_ERR_OPERATION_TIMEOUT',
-                   'VIR_ERR_CONFIG_UNSUPPORTED',
-                   'VIR_FROM_XENXM',
-                   'VIR_ERR_OPERATION_INVALID',
-                   'VIR_ERR_NO_SECURITY_MODEL',
-                   'VIR_ERR_AUTH_FAILED',
-                   'VIR_FROM_PHYP',
-                   'VIR_FROM_ESX',
-                   'VIR_FROM_ONE',
-                   'VIR_FROM_VBOX',
-                   'VIR_FROM_LXC',
-                   'VIR_FROM_UML',
-                   'VIR_FROM_NETWORK',
-                   'VIR_FROM_DOMAIN',
-                   'VIR_FROM_STATS_LINUX',
-                   'VIR_FROM_XEN_INOTIFY',
-                   'VIR_FROM_SECURITY',
                    'VIR_DOMAIN_AFFECT_CURRENT',
                    'VIR_DOMAIN_MEM_CURRENT',
                    'VIR_DOMAIN_EVENT_ID_CONTROL_ERROR',
+                   'VIR_DOMAIN_PAUSED_SHUTTING_DOWN',
+                   'VIR_DOMAIN_START_AUTODESTROY',
+                   'VIR_DOMAIN_START_BYPASS_CACHE',
+                   'VIR_DOMAIN_START_FORCE_BOOT',
+                   'VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON',
+                   'VIR_DUMP_BYPASS_CACHE',
+                   'VIR_MIGRATE_CHANGE_PROTECTION',
+                   'VIR_DOMAIN_SAVE_BYPASS_CACHE',
+                   'VIR_DOMAIN_SAVE_RUNNING',
+                   'VIR_DOMAIN_SAVE_PAUSED',
+                   'VIR_NETWORK_UPDATE_COMMAND_NONE',
+                   'VIR_NETWORK_UPDATE_COMMAND_MODIFY',
+                   'VIR_NETWORK_UPDATE_COMMAND_DELETE',
+                   'VIR_NETWORK_UPDATE_COMMAND_ADD_LAST',
+                   'VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST',
+                   'VIR_NETWORK_SECTION_NONE',
+                   'VIR_NETWORK_SECTION_BRIDGE',
+                   'VIR_NETWORK_SECTION_DOMAIN',
+                   'VIR_NETWORK_SECTION_IP',
+                   'VIR_NETWORK_SECTION_IP_DHCP_HOST',
+                   'VIR_NETWORK_SECTION_IP_DHCP_RANGE',
+                   'VIR_NETWORK_SECTION_FORWARD',
+                   'VIR_NETWORK_SECTION_FORWARD_INTERFACE',
+                   'VIR_NETWORK_SECTION_FORWARD_PF',
+                   'VIR_NETWORK_SECTION_PORTGROUP',
+                   'VIR_NETWORK_SECTION_DNS_HOST',
+                   'VIR_NETWORK_SECTION_DNS_TXT',
+                   'VIR_NETWORK_SECTION_DNS_SRV',
+                   'VIR_NETWORK_UPDATE_AFFECT_CURRENT',
+                   'VIR_NETWORK_UPDATE_AFFECT_LIVE',
+                   'VIR_NETWORK_UPDATE_AFFECT_CONFIG',
+                   'VIR_DOMAIN_PMSUSPENDED',
+                   'VIR_DOMAIN_RUNNING_WAKEUP',
+                   'VIR_DOMAIN_PMSUSPENDED_UNKNOWN',
+                   'VIR_DOMAIN_UNDEFINE_MANAGED_SAVE',
+                   'VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA',
+                   'VIR_DOMAIN_PAUSED_SNAPSHOT',
+                   'VIR_DOMAIN_PMSUSPENDED_DISK_UNKNOWN',
+                   'VIR_DUMP_RESET',
+                   'VIR_DUMP_MEMORY_ONLY',
+                   'VIR_DOMAIN_SHUTDOWN_DEFAULT',
+                   'VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN',
+                   'VIR_DOMAIN_SHUTDOWN_GUEST_AGENT',
+                   'VIR_DOMAIN_SHUTDOWN_INITCTL',
+                   'VIR_DOMAIN_SHUTDOWN_SIGNAL',
+                   'VIR_DOMAIN_REBOOT_DEFAULT',
+                   'VIR_DOMAIN_REBOOT_ACPI_POWER_BTN',
+                   'VIR_DOMAIN_REBOOT_GUEST_AGENT',
+                   'VIR_DOMAIN_REBOOT_INITCTL',
+                   'VIR_DOMAIN_REBOOT_SIGNAL',
+                   'VIR_DOMAIN_DESTROY_DEFAULT',
+                   'VIR_DOMAIN_DESTROY_GRACEFUL',
+                   'VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST',
+                   'VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE',
+                   'VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE',
+                   'VIR_DOMAIN_SNAPSHOT_CREATE_LIVE',
+                   'VIR_DOMAIN_BLOCK_REBASE_SHALLOW',
+                   'VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT',
+                   'VIR_DOMAIN_BLOCK_REBASE_COPY_RAW',
+                   'VIR_DOMAIN_BLOCK_REBASE_COPY',
+                   'VIR_DOMAIN_CHANNEL_FORCE',
+                   'VIR_DOMAIN_CONSOLE_FORCE',
+                   'VIR_DOMAIN_CONSOLE_SAFE',
+                   'VIR_STORAGE_VOL_WIPE_ALG_ZERO',
+                   'VIR_STORAGE_VOL_WIPE_ALG_NNSA',
+                   'VIR_STORAGE_VOL_WIPE_ALG_DOD',
+                   'VIR_STORAGE_VOL_WIPE_ALG_BSI',
+                   'VIR_STORAGE_VOL_WIPE_ALG_GUTMANN',
+                   'VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER',
+                   'VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7',
+                   'VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33',
+                   'VIR_STORAGE_VOL_WIPE_ALG_RANDOM',
+                   'VIR_DOMAIN_BLOCK_RESIZE_BYTES',
+                   'VIR_DOMAIN_MEMORY_STAT_RSS',
+                   'VIR_MIGRATE_UNSAFE',
+                   'VIR_MIGRATE_OFFLINE',
+                   'VIR_MIGRATE_COMPRESSED',
+                   'VIR_MIGRATE_ABORT_ON_ERROR',
+                   'VIR_CONNECT_NO_ALIASES',
+                   'VIR_DOMAIN_XML_MIGRATABLE',
+                   'VIR_NETWORK_XML_INACTIVE',
+                   'VIR_STORAGE_VOL_DIR',
+                   'VIR_STORAGE_VOL_NETWORK',
+                   'VIR_STORAGE_XML_INACTIVE',
+                   'VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA',
+                   'VIR_SECRET_USAGE_TYPE_CEPH',
+                   'VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING',
+                   'VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED',
+                   'VIR_DOMAIN_SNAPSHOT_REVERT_FORCE',
+                   'VIR_SECRET_USAGE_TYPE_ISCSI',
+                   'VIR_DOMAIN_NOSTATE_UNKNOWN',
+                   'VIR_DOMAIN_RUNNING_CRASHED',
+                   'VIR_DOMAIN_PAUSED_CRASHED',
+                   'VIR_DOMAIN_CRASHED_PANICKED',
+                   'VIR_NODE_CPU_STATS_ALL_CPUS',
+                   'VIR_NODE_MEMORY_STATS_ALL_CELLS',
+                   'VIR_DOMAIN_VCPU_CURRENT',
+                   'VIR_DOMAIN_VCPU_GUEST',
+                   'VIR_NETWORK_UPDATE_COMMAND_DELETE',
+                   'VIR_STORAGE_POOL_BUILD_NO_OVERWRITE',
+                   'VIR_STORAGE_POOL_BUILD_OVERWRITE',
+                   'VIR_KEYCODE_SET_LINUX',
+                   'VIR_KEYCODE_SET_XT',
+                   'VIR_KEYCODE_SET_ATSET1',
+                   'VIR_KEYCODE_SET_ATSET2',
+                   'VIR_KEYCODE_SET_ATSET3',
+                   'VIR_KEYCODE_SET_OSX',
+                   'VIR_KEYCODE_SET_XT_KBD',
+                   'VIR_KEYCODE_SET_USB',
+                   'VIR_KEYCODE_SET_WIN32',
+                   'VIR_KEYCODE_SET_RFB',
+                   'VIR_DOMAIN_EVENT_SHUTDOWN',
+                   'VIR_DOMAIN_EVENT_PMSUSPENDED',
+                   'VIR_DOMAIN_EVENT_CRASHED',
+                   'VIR_DOMAIN_EVENT_STARTED_WAKEUP',
+                   'VIR_DOMAIN_EVENT_SUSPENDED_RESTORED',
+                   'VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT',
+                   'VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR',
+                   'VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT',
+                   'VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED',
+                   'VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY',
+                   'VIR_DOMAIN_EVENT_PMSUSPENDED_DISK',
+                   'VIR_DOMAIN_EVENT_CRASHED_PANICKED',
+                   'VIR_SECRET_USAGE_TYPE_NONE',
+                   'VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES',
+                   'VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY',
+                   'VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY',
+                   'VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_UNIX',
+                   'VIR_DOMAIN_BLOCK_COMMIT_SHALLOW',
+                   'VIR_DOMAIN_BLOCK_COMMIT_DELETE',
+                   'VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN',
+                   'VIR_DOMAIN_BLOCK_JOB_TYPE_PULL',
+                   'VIR_DOMAIN_BLOCK_JOB_TYPE_COPY',
+                   'VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT',
+                   'VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC',
+                   'VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT',
+                   'VIR_DOMAIN_BLOCK_JOB_COMPLETED',
+                   'VIR_DOMAIN_BLOCK_JOB_FAILED',
+                   'VIR_DOMAIN_BLOCK_JOB_CANCELED',
+                   'VIR_DOMAIN_BLOCK_JOB_READY',
+                   'VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES',
+                   'VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC',
                  ]
-have_libvirt_types(libvirt_types)
-have_libvirt_funcs(libvirt_funcs)
+virterror_consts = [
+                    'VIR_FROM_VMWARE',
+                    'VIR_FROM_AUDIT',
+                    'VIR_FROM_SYSINFO',
+                    'VIR_FROM_STREAMS',
+                    'VIR_FROM_XENAPI',
+                    'VIR_FROM_HOOK',
+                    'VIR_ERR_HOOK_SCRIPT_FAILED',
+                    'VIR_ERR_MIGRATE_PERSIST_FAILED',
+                    'VIR_ERR_OPERATION_TIMEOUT',
+                    'VIR_ERR_CONFIG_UNSUPPORTED',
+                    'VIR_FROM_XENXM',
+                    'VIR_ERR_OPERATION_INVALID',
+                    'VIR_ERR_NO_SECURITY_MODEL',
+                    'VIR_ERR_AUTH_FAILED',
+                    'VIR_FROM_PHYP',
+                    'VIR_FROM_ESX',
+                    'VIR_FROM_ONE',
+                    'VIR_FROM_VBOX',
+                    'VIR_FROM_LXC',
+                    'VIR_FROM_UML',
+                    'VIR_FROM_NETWORK',
+                    'VIR_FROM_DOMAIN',
+                    'VIR_FROM_STATS_LINUX',
+                    'VIR_FROM_XEN_INOTIFY',
+                    'VIR_FROM_SECURITY',
+                   ]
+libvirt_qemu_consts = [
+                       'VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK',
+                       'VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT',
+                       'VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT',
+                       'VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT',
+                       'VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP',
+                      ]
+libvirt_types.each { |t| have_type(t, "libvirt/libvirt.h") }
+libvirt_funcs.each { |f| have_func(f, "libvirt/libvirt.h") }
+libvirt_consts.each { |c| have_const(c, ["libvirt/libvirt.h"]) }
+virterror_consts.each { |c| have_const(c, ["libvirt/virterror.h"]) }
 if find_header("libvirt/libvirt-qemu.h")
   have_library("virt-qemu", "virDomainQemuMonitorCommand")
-  have_func("virDomainQemuMonitorCommand", "libvirt/libvirt-qemu.h")
+  libvirt_qemu_funcs.each { |f| have_func(f, "libvirt/libvirt-qemu.h") }
+  libvirt_qemu_consts.each { |c| have_const(c, ["libvirt/libvirt-qemu.h"]) }
 end
-have_libvirt_consts(libvirt_consts)
+if find_header("libvirt/libvirt-lxc.h")
+  have_library("virt-lxc", "virDomainLxcOpenNamespace")
+  libvirt_lxc_funcs.each{ |f| have_func(f, "libvirt/libvirt-lxc.h") }
+end
 create_header
 create_makefile(extension_name)

data/ext/libvirt/interface.c CHANGED Viewed

@@ -2,6 +2,7 @@
  * interface.c: virInterface methods
  *
  * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2013 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
@@ -28,63 +29,71 @@
 #if HAVE_TYPE_VIRINTERFACEPTR
 static VALUE c_interface;
-static void interface_free(void *i) {
-    generic_free(Interface, i);
+static void interface_free(void *i)
+{
+    ruby_libvirt_free_struct(Interface, i);
 }
-static virInterfacePtr interface_get(VALUE s) {
-    generic_get(Interface, s);
+static virInterfacePtr interface_get(VALUE i)
+{
+    ruby_libvirt_get_struct(Interface, i);
 }
-VALUE interface_new(virInterfacePtr i, VALUE conn) {
-    return generic_new(c_interface, i, conn, interface_free);
+VALUE ruby_libvirt_interface_new(virInterfacePtr i, VALUE conn)
+{
+    return ruby_libvirt_new_class(c_interface, i, conn, interface_free);
 }
 /*
  * call-seq:
  *   interface.undefine -> nil
  *
- * Call +virInterfaceUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceUndefine]
+ * Call virInterfaceUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceUndefine]
  * to undefine this interface.
  */
-static VALUE libvirt_interface_undefine(VALUE s) {
-    gen_call_void(virInterfaceUndefine, conn(s), interface_get(s));
+static VALUE libvirt_interface_undefine(VALUE i)
+{
+    ruby_libvirt_generate_call_nil(virInterfaceUndefine,
+                                   ruby_libvirt_connect_get(i),
+                                   interface_get(i));
 }
 /*
  * call-seq:
  *   interface.create(flags=0) -> nil
  *
- * Call +virInterfaceCreate+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceCreate]
+ * Call virInterfaceCreate[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceCreate]
  * to start this interface.
  */
-static VALUE libvirt_interface_create(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_interface_create(int argc, VALUE *argv, VALUE i)
+{
     VALUE flags;
     rb_scan_args(argc, argv, "01", &flags);
-    if (NIL_P(flags))
-        flags = INT2NUM(0);
-    gen_call_void(virInterfaceCreate, conn(s), interface_get(s),
-                  NUM2UINT(flags));
+    ruby_libvirt_generate_call_nil(virInterfaceCreate,
+                                   ruby_libvirt_connect_get(i),
+                                   interface_get(i),
+                                   ruby_libvirt_value_to_uint(flags));
 }
 /*
  * call-seq:
  *   interface.destroy(flags=0) -> nil
  *
- * Call +virInterfaceDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceDestroy]
+ * Call virInterfaceDestroy[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceDestroy]
  * to shutdown this interface.
  */
-static VALUE libvirt_interface_destroy(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_interface_destroy(int argc, VALUE *argv, VALUE i)
+{
     VALUE flags;
     rb_scan_args(argc, argv, "01", &flags);
-    if (NIL_P(flags))
-        flags = INT2NUM(0);
-    gen_call_void(virInterfaceDestroy, conn(s), interface_get(s),
-                  NUM2UINT(flags));
+    ruby_libvirt_generate_call_nil(virInterfaceDestroy,
+                                   ruby_libvirt_connect_get(i),
+                                   interface_get(i),
+                                   ruby_libvirt_value_to_uint(flags));
 }
 #if HAVE_VIRINTERFACEISACTIVE
@@ -92,11 +101,14 @@ static VALUE libvirt_interface_destroy(int argc, VALUE *argv, VALUE s) {
  * call-seq:
  *   interface.active? -> [true|false]
  *
- * Call +virInterfaceIsActive+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceIsActive]
+ * Call virInterfaceIsActive[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceIsActive]
  * to determine if this interface is currently active.
  */
-static VALUE libvirt_interface_active_p(VALUE p) {
-    gen_call_truefalse(virInterfaceIsActive, conn(p), interface_get(p));
+static VALUE libvirt_interface_active_p(VALUE p)
+{
+    ruby_libvirt_generate_call_truefalse(virInterfaceIsActive,
+                                         ruby_libvirt_connect_get(p),
+                                         interface_get(p));
 }
 #endif
@@ -104,59 +116,66 @@ static VALUE libvirt_interface_active_p(VALUE p) {
  * call-seq:
  *   interface.name -> string
  *
- * Call +virInterfaceGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetName]
+ * Call virInterfaceGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetName]
  * to retrieve the name of this interface.
  */
-static VALUE libvirt_interface_name(VALUE s) {
-    gen_call_string(virInterfaceGetName, conn(s), 0, interface_get(s));
+static VALUE libvirt_interface_name(VALUE i)
+{
+    ruby_libvirt_generate_call_string(virInterfaceGetName,
+                                      ruby_libvirt_connect_get(i), 0,
+                                      interface_get(i));
 }
 /*
  * call-seq:
  *   interface.mac -> string
  *
- * Call +virInterfaceGetMACString+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetMACString]
+ * Call virInterfaceGetMACString[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetMACString]
  * to retrieve the MAC address of this interface.
  */
-static VALUE libvirt_interface_mac(VALUE s) {
-    gen_call_string(virInterfaceGetMACString, conn(s), 0, interface_get(s));
+static VALUE libvirt_interface_mac(VALUE i)
+{
+    ruby_libvirt_generate_call_string(virInterfaceGetMACString,
+                                      ruby_libvirt_connect_get(i),
+                                      0, interface_get(i));
 }
 /*
  * call-seq:
  *   interface.xml_desc -> string
  *
- * Call +virInterfaceGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetXMLDesc]
+ * Call virInterfaceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceGetXMLDesc]
  * to retrieve the XML of this interface.
  */
-static VALUE libvirt_interface_xml_desc(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_interface_xml_desc(int argc, VALUE *argv, VALUE i)
+{
     VALUE flags;
     rb_scan_args(argc, argv, "01", &flags);
-    if (NIL_P(flags))
-        flags = INT2NUM(0);
-    gen_call_string(virInterfaceGetXMLDesc, conn(s), 1, interface_get(s),
-                    NUM2UINT(flags));
+    ruby_libvirt_generate_call_string(virInterfaceGetXMLDesc,
+                                      ruby_libvirt_connect_get(i),
+                                      1, interface_get(i),
+                                      ruby_libvirt_value_to_uint(flags));
 }
 /*
  * call-seq:
  *   interface.free -> nil
  *
- * Call +virInterfaceFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceFree]
+ * Call virInterfaceFree[http://www.libvirt.org/html/libvirt-libvirt.html#virInterfaceFree]
  * to free this interface.  The object will no longer be valid after this call.
  */
-static VALUE libvirt_interface_free(VALUE s) {
-    gen_call_free(Interface, s);
+static VALUE libvirt_interface_free(VALUE i)
+{
+    ruby_libvirt_generate_call_free(Interface, i);
 }
 #endif
 /*
  * Class Libvirt::Interface
  */
-void init_interface()
+void ruby_libvirt_interface_init(void)
 {
 #if HAVE_TYPE_VIRINTERFACEPTR
     c_interface = rb_define_class_under(m_libvirt, "Interface", rb_cObject);