ruby-libvirt 0.4.0 → 0.5.0

data/ext/libvirt/network.h

@@ -1,7 +1,8 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-VALUE network_new(virNetworkPtr n, VALUE conn);
-void init_network();
+void ruby_libvirt_network_init(void);
+
+VALUE ruby_libvirt_network_new(virNetworkPtr n, VALUE conn);
 
 #endif

data/ext/libvirt/nodedevice.c

@@ -2,6 +2,7 @@
  * nodedevice.c: virNodeDevice 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,142 +29,183 @@
 #if HAVE_TYPE_VIRNODEDEVICEPTR
 static VALUE c_nodedevice;
 
-static void nodedevice_free(void *s) {
-    generic_free(NodeDevice, s);
+static void nodedevice_free(void *s)
+{
+    ruby_libvirt_free_struct(NodeDevice, s);
 }
 
-static virNodeDevicePtr nodedevice_get(VALUE s) {
-    generic_get(NodeDevice, s);
+static virNodeDevicePtr nodedevice_get(VALUE n)
+{
+    ruby_libvirt_get_struct(NodeDevice, n);
 }
 
-VALUE nodedevice_new(virNodeDevicePtr s, VALUE conn) {
-    return generic_new(c_nodedevice, s, conn, nodedevice_free);
+VALUE ruby_libvirt_nodedevice_new(virNodeDevicePtr n, VALUE conn)
+{
+    return ruby_libvirt_new_class(c_nodedevice, n, conn, nodedevice_free);
 }
 
 /*
  * call-seq:
  *   nodedevice.name -> string
  *
- * Call +virNodeDeviceGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetName]
+ * Call virNodeDeviceGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetName]
  * to retrieve the name of the node device.
  */
-static VALUE libvirt_nodedevice_name(VALUE c) {
-    gen_call_string(virNodeDeviceGetName, conn(c), 0, nodedevice_get(c));
+static VALUE libvirt_nodedevice_name(VALUE c)
+{
+    ruby_libvirt_generate_call_string(virNodeDeviceGetName,
+                                      ruby_libvirt_connect_get(c), 0,
+                                      nodedevice_get(c));
 }
 
 /*
  * call-seq:
  *   nodedevice.parent -> string
  *
- * Call +virNodeDeviceGetParent+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetParent]
+ * Call virNodeDeviceGetParent[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetParent]
  * to retrieve the parent of the node device.
  */
-static VALUE libvirt_nodedevice_parent(VALUE c) {
-    /* unfortunately we can't use gen_call_string() here because
-     * virNodeDeviceGetParent() returns NULL as a valid value (when this
-     * device has no parent.  Hand-code it instead
+static VALUE libvirt_nodedevice_parent(VALUE c)
+{
+    /* unfortunately we can't use ruby_libvirt_generate_call_string() here
+     * because virNodeDeviceGetParent() returns NULL as a valid value (when this
+     * device has no parent).  Hand-code it instead
      */
 
     const char *str;
 
     str = virNodeDeviceGetParent(nodedevice_get(c));
-    if (str == NULL)
+    if (str == NULL) {
         return Qnil;
-    else
+    }
+    else {
         return rb_str_new2(str);
+    }
 }
 
 /*
  * call-seq:
  *   nodedevice.num_of_caps -> fixnum
  *
- * Call +virNodeDeviceNumOfCaps+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceNumOfCaps]
+ * Call virNodeDeviceNumOfCaps[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceNumOfCaps]
  * to retrieve the number of capabilities of the node device.
  */
-static VALUE libvirt_nodedevice_num_of_caps(VALUE c) {
-    gen_call_int(virNodeDeviceNumOfCaps, conn(c), nodedevice_get(c));
+static VALUE libvirt_nodedevice_num_of_caps(VALUE c)
+{
+    ruby_libvirt_generate_call_int(virNodeDeviceNumOfCaps,
+                                   ruby_libvirt_connect_get(c),
+                                   nodedevice_get(c));
 }
 
 /*
  * call-seq:
  *   nodedevice.list_caps -> list
  *
- * Call +virNodeDeviceListCaps+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceListCaps]
+ * Call virNodeDeviceListCaps[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceListCaps]
  * to retrieve a list of capabilities of the node device.
  */
-static VALUE libvirt_nodedevice_list_caps(VALUE c) {
+static VALUE libvirt_nodedevice_list_caps(VALUE c)
+{
     int r, num;
-    virConnectPtr conn = connect_get(c);
-    virNodeDevicePtr nodedev = nodedevice_get(c);
     char **names;
 
-    num = virNodeDeviceNumOfCaps(nodedev);
-    _E(num < 0, create_error(e_RetrieveError, "virNodeDeviceNumOfCaps", conn));
-    if (num == 0)
+    num = virNodeDeviceNumOfCaps(nodedevice_get(c));
+    ruby_libvirt_raise_error_if(num < 0, e_RetrieveError,
+                                "virNodeDeviceNumOfCaps",
+                                ruby_libvirt_connect_get(c));
+    if (num == 0) {
         /* if num is 0, don't call virNodeDeviceListCaps function */
         return rb_ary_new2(num);
-
-    names = ALLOC_N(char *, num);
-    r = virNodeDeviceListCaps(nodedev, names, num);
-    if (r < 0) {
-        xfree(names);
-        rb_exc_raise(create_error(e_RetrieveError, "virNodeDeviceListCaps",
-                                  conn));
     }
 
-    return gen_list(num, &names);
+    names = alloca(sizeof(char *) * num);
+    r = virNodeDeviceListCaps(nodedevice_get(c), names, num);
+    ruby_libvirt_raise_error_if(r < 0, e_RetrieveError,
+                                "virNodeDeviceListCaps",
+                                ruby_libvirt_connect_get(c));
+
+    return ruby_libvirt_generate_list(num, names);
 }
 
 /*
  * call-seq:
  *   nodedevice.xml_desc(flags=0) -> string
  *
- * Call +virNodeDeviceGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetXMLDesc]
+ * Call virNodeDeviceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetXMLDesc]
  * to retrieve the XML for the node device.
  */
-static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE n)
+{
     VALUE flags;
 
     rb_scan_args(argc, argv, "01", &flags);
 
-    if (NIL_P(flags))
-        flags = INT2NUM(0);
-
-    gen_call_string(virNodeDeviceGetXMLDesc, conn(s), 1,
-                    nodedevice_get(s), NUM2UINT(flags));
+    ruby_libvirt_generate_call_string(virNodeDeviceGetXMLDesc,
+                                      ruby_libvirt_connect_get(n),
+                                      1, nodedevice_get(n),
+                                      ruby_libvirt_value_to_uint(flags));
 }
 
 /*
  * call-seq:
- *   nodedevice.detach -> nil
+ *   nodedevice.detach(driver=nil, flags=0) -> nil
  *
- * Call +virNodeDeviceDettach+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDettach]
+ * Call virNodeDeviceDettach[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDettach]
  * to detach the node device from the node.
  */
-static VALUE libvirt_nodedevice_detach(VALUE s) {
-    gen_call_void(virNodeDeviceDettach, conn(s), nodedevice_get(s));
+static VALUE libvirt_nodedevice_detach(int argc, VALUE *argv, VALUE n)
+{
+    VALUE driver, flags;
+
+    rb_scan_args(argc, argv, "02", &driver, &flags);
+
+#if HAVE_VIRNODEDEVICEDETACHFLAGS
+    ruby_libvirt_generate_call_nil(virNodeDeviceDetachFlags,
+                                   ruby_libvirt_connect_get(n),
+                                   nodedevice_get(n),
+                                   ruby_libvirt_get_cstring_or_null(driver),
+                                   ruby_libvirt_value_to_uint(flags));
+#else
+    if (ruby_libvirt_value_to_uint(flags) != 0) {
+        rb_raise(e_NoSupportError, "Non-zero flags not supported");
+    }
+
+    if (ruby_libvirt_get_cstring_or_null(driver) != NULL) {
+        rb_raise(e_NoSupportError, "Non-NULL driver not supported");
+    }
+
+    ruby_libvirt_generate_call_nil(virNodeDeviceDettach,
+                                   ruby_libvirt_connect_get(n),
+                                   nodedevice_get(n));
+#endif
 }
 
 /*
  * call-seq:
  *   nodedevice.reattach -> nil
  *
- * Call +virNodeDeviceReAttach+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReAttach]
+ * Call virNodeDeviceReAttach[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReAttach]
  * to reattach the node device to the node.
  */
-static VALUE libvirt_nodedevice_reattach(VALUE s) {
-    gen_call_void(virNodeDeviceReAttach, conn(s), nodedevice_get(s));
+static VALUE libvirt_nodedevice_reattach(VALUE n)
+{
+    ruby_libvirt_generate_call_nil(virNodeDeviceReAttach,
+                                   ruby_libvirt_connect_get(n),
+                                   nodedevice_get(n));
 }
 
 /*
  * call-seq:
  *   nodedevice.reset -> nil
  *
- * Call +virNodeDeviceReset+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReset]
+ * Call virNodeDeviceReset[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReset]
  * to reset the node device.
  */
-static VALUE libvirt_nodedevice_reset(VALUE s) {
-    gen_call_void(virNodeDeviceReset, conn(s), nodedevice_get(s));
+static VALUE libvirt_nodedevice_reset(VALUE n)
+{
+    ruby_libvirt_generate_call_nil(virNodeDeviceReset,
+                                   ruby_libvirt_connect_get(n),
+                                   nodedevice_get(n));
 }
 
 #if HAVE_VIRNODEDEVICEDESTROY
@@ -171,11 +213,14 @@ static VALUE libvirt_nodedevice_reset(VALUE s) {
  * call-seq:
  *   nodedevice.destroy -> nil
  *
- * Call +virNodeDeviceDestroy+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDestroy]
+ * Call virNodeDeviceDestroy[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDestroy]
  * to shutdown the node device.
  */
-static VALUE libvirt_nodedevice_destroy(VALUE s) {
-    gen_call_void(virNodeDeviceDestroy, conn(s), nodedevice_get(s));
+static VALUE libvirt_nodedevice_destroy(VALUE n)
+{
+    ruby_libvirt_generate_call_nil(virNodeDeviceDestroy,
+                                   ruby_libvirt_connect_get(n),
+                                   nodedevice_get(n));
 }
 #endif
 
@@ -183,19 +228,49 @@ static VALUE libvirt_nodedevice_destroy(VALUE s) {
  * call-seq:
  *   nodedevice.free -> nil
  *
- * Call +virNodeDeviceFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceFree]
+ * Call virNodeDeviceFree[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceFree]
  * to free the node device object.  After this call the node device object is
  * no longer valid.
  */
-static VALUE libvirt_nodedevice_free(VALUE s) {
-    gen_call_free(NodeDevice, s);
+static VALUE libvirt_nodedevice_free(VALUE n)
+{
+    ruby_libvirt_generate_call_free(NodeDevice, n);
+}
+
+#if HAVE_VIRNODEDEVICELOOKUPSCSIHOSTBYWWN
+/*
+ * call-seq:
+ *   nodedevice.lookup_scsi_host_by_wwn(wwnn, wwpn, flags=0) -> Libvirt::NodeDevice
+ *
+ * Call virNodeDeviceLookupSCSIHostByWWN[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceLookupSCSIHostByWWN]
+ * to look up a SCSI host by its WWNN and WWPN.
+ */
+static VALUE libvirt_nodedevice_lookup_scsi_host_by_wwn(int argc, VALUE *argv,
+                                                        VALUE n)
+{
+    VALUE wwnn, wwpn, flags;
+    virNodeDevicePtr nd;
+
+    rb_scan_args(argc, argv, "21", &wwnn, &wwpn, &flags);
+
+    nd = virNodeDeviceLookupSCSIHostByWWN(ruby_libvirt_connect_get(n),
+                                          StringValueCStr(wwnn),
+                                          StringValueCStr(wwpn),
+                                          ruby_libvirt_value_to_uint(flags));
+    if (nd == NULL) {
+        return Qnil;
+    }
+
+    return ruby_libvirt_nodedevice_new(nd, ruby_libvirt_conn_attr(n));
 }
 #endif
 
+#endif
+
 /*
  * Class Libvirt::NodeDevice
  */
-void init_nodedevice()
+void ruby_libvirt_nodedevice_init(void)
 {
 #if HAVE_TYPE_VIRNODEDEVICEPTR
     c_nodedevice = rb_define_class_under(m_libvirt, "NodeDevice", rb_cObject);
@@ -209,12 +284,16 @@ void init_nodedevice()
     rb_define_method(c_nodedevice, "list_caps",
                      libvirt_nodedevice_list_caps, 0);
     rb_define_method(c_nodedevice, "xml_desc", libvirt_nodedevice_xml_desc, -1);
-    rb_define_method(c_nodedevice, "detach", libvirt_nodedevice_detach, 0);
+    rb_define_method(c_nodedevice, "detach", libvirt_nodedevice_detach, -1);
     rb_define_method(c_nodedevice, "reattach", libvirt_nodedevice_reattach, 0);
     rb_define_method(c_nodedevice, "reset", libvirt_nodedevice_reset, 0);
 #if HAVE_VIRNODEDEVICEDESTROY
     rb_define_method(c_nodedevice, "destroy", libvirt_nodedevice_destroy, 0);
 #endif
     rb_define_method(c_nodedevice, "free", libvirt_nodedevice_free, 0);
+#if HAVE_VIRNODEDEVICELOOKUPSCSIHOSTBYWWN
+    rb_define_method(c_nodedevice, "lookup_scsi_host_by_wwn",
+                     libvirt_nodedevice_lookup_scsi_host_by_wwn, -1);
+#endif
 #endif
 }

data/ext/libvirt/nodedevice.h

@@ -1,6 +1,8 @@
 #ifndef NODEDEVICE_H
 #define NODEDEVICE_H
 
-void init_nodedevice();
+void ruby_libvirt_nodedevice_init(void);
+
+VALUE ruby_libvirt_nodedevice_new(virNodeDevicePtr n, VALUE conn);
 
 #endif

data/ext/libvirt/nwfilter.c

@@ -2,6 +2,7 @@
  * nwfilter.c: virNWFilter 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,88 +29,92 @@
 #if HAVE_TYPE_VIRNWFILTERPTR
 static VALUE c_nwfilter;
 
-static void nwfilter_free(void *nw) {
-    generic_free(NWFilter, nw);
+static void nwfilter_free(void *n)
+{
+    ruby_libvirt_free_struct(NWFilter, n);
 }
 
-static virNWFilterPtr nwfilter_get(VALUE nw) {
-    generic_get(NWFilter, nw);
+static virNWFilterPtr nwfilter_get(VALUE n)
+{
+    ruby_libvirt_get_struct(NWFilter, n);
 }
 
-VALUE nwfilter_new(virNWFilterPtr nw, VALUE conn) {
-    return generic_new(c_nwfilter, nw, conn, nwfilter_free);
+VALUE ruby_libvirt_nwfilter_new(virNWFilterPtr n, VALUE conn)
+{
+    return ruby_libvirt_new_class(c_nwfilter, n, conn, nwfilter_free);
 }
 
 /*
  * call-seq:
  *   nwfilter.undefine -> nil
  *
- * Call +virNWFilterUndefine+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterUndefine]
+ * Call virNWFilterUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterUndefine]
  * to undefine the network filter.
  */
-static VALUE libvirt_nwfilter_undefine(VALUE s) {
-    gen_call_void(virNWFilterUndefine, conn(s), nwfilter_get(s));
+static VALUE libvirt_nwfilter_undefine(VALUE n)
+{
+    ruby_libvirt_generate_call_nil(virNWFilterUndefine,
+                                   ruby_libvirt_connect_get(n),
+                                   nwfilter_get(n));
 }
 
 /*
  * call-seq:
  *   nwfilter.name -> string
  *
- * Call +virNWFilterGetName+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetName]
+ * Call virNWFilterGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetName]
  * to retrieve the network filter name.
  */
-static VALUE libvirt_nwfilter_name(VALUE s) {
-    gen_call_string(virNWFilterGetName, conn(s), 0, nwfilter_get(s));
+static VALUE libvirt_nwfilter_name(VALUE n)
+{
+    ruby_libvirt_generate_call_string(virNWFilterGetName,
+                                      ruby_libvirt_connect_get(n), 0,
+                                      nwfilter_get(n));
 }
 
 /*
  * call-seq:
  *   nwfilter.uuid -> string
  *
- * Call +virNWFilterGetUUIDString+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetUUIDString]
+ * Call virNWFilterGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetUUIDString]
  * to retrieve the network filter UUID.
  */
-static VALUE libvirt_nwfilter_uuid(VALUE s) {
-    virNWFilterPtr nwfilter = nwfilter_get(s);
-    int r;
-    char uuid[VIR_UUID_STRING_BUFLEN];
-
-    r = virNWFilterGetUUIDString(nwfilter, uuid);
-    _E(r < 0, create_error(e_RetrieveError, "virNWFilterGetUUIDString",
-                           conn(s)));
-
-    return rb_str_new2((char *)uuid);
+static VALUE libvirt_nwfilter_uuid(VALUE n)
+{
+    ruby_libvirt_generate_uuid(virNWFilterGetUUIDString,
+                               ruby_libvirt_connect_get(n), nwfilter_get(n));
 }
 
 /*
  * call-seq:
  *   nwfilter.xml_desc(flags=0) -> string
  *
- * Call +virNWFilterGetXMLDesc+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetXMLDesc]
+ * Call virNWFilterGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetXMLDesc]
  * to retrieve the XML for this network filter.
  */
-static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE s) {
+static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE n)
+{
     VALUE flags;
 
     rb_scan_args(argc, argv, "01", &flags);
 
-    if (NIL_P(flags))
-        flags = INT2NUM(0);
-
-    gen_call_string(virNWFilterGetXMLDesc, conn(s), 1, nwfilter_get(s),
-                    NUM2UINT(flags));
+    ruby_libvirt_generate_call_string(virNWFilterGetXMLDesc,
+                                      ruby_libvirt_connect_get(n), 1,
+                                      nwfilter_get(n),
+                                      ruby_libvirt_value_to_uint(flags));
 }
 
 /*
  * call-seq:
  *   nwfilter.free -> nil
  *
- * Call +virNWFilterFree+[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterFree]
+ * Call virNWFilterFree[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterFree]
  * to free this network filter.  After this call the network filter object is
  * no longer valid.
  */
-static VALUE libvirt_nwfilter_free(VALUE s) {
-    gen_call_free(NWFilter, s);
+static VALUE libvirt_nwfilter_free(VALUE n)
+{
+    ruby_libvirt_generate_call_free(NWFilter, n);
 }
 
 #endif
@@ -117,7 +122,7 @@ static VALUE libvirt_nwfilter_free(VALUE s) {
 /*
  * Class Libvirt::NWFilter
  */
-void init_nwfilter()
+void ruby_libvirt_nwfilter_init(void)
 {
 #if HAVE_TYPE_VIRNWFILTERPTR
     c_nwfilter = rb_define_class_under(m_libvirt, "NWFilter", rb_cObject);