Merge remote-tracking branch 'github-tokkee/sh/netapp'

[collectd.git] / src / libvirt.c

diff --git a/src/libvirt.c b/src/libvirt.c
index 2aa0a7ade3c974b17f96d3fd312798e5814be141..c53a81d4b5d1e4261667954b079d26e36a797e07 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -141,8 +141,6 @@ init_value_list (value_list_t *vl, virDomainPtr dom)
     const char *name;
     char uuid[VIR_UUID_STRING_BUFLEN];
 
-    vl->interval = interval_g;
-
     sstrncpy (vl->plugin, "libvirt", sizeof (vl->plugin));
 
     vl->host[0] = '\0';
@@ -658,7 +656,7 @@ refresh_lists (void)
                      ignore_device_match (il_interface_devices, name, address) != 0))
                     goto cont3;
 
-               add_interface_device (dom, path, address, j+1);
+                add_interface_device (dom, path, address, j+1);
                 cont3:
                     if (path) xmlFree (path);
                     if (address) xmlFree (address);
@@ -779,10 +777,10 @@ add_interface_device (virDomainPtr dom, const char *path, const char *address, u
 
     address_copy = strdup (address);
     if (!address_copy) {
-               sfree(path_copy)
-               return -1;
-       }
-       
+        sfree(path_copy);
+        return -1;
+    }
+
     snprintf(number_string, sizeof (number_string), "interface-%u", number);
 
     if (interface_devices)
@@ -829,7 +827,7 @@ lv_shutdown (void)
     free_domains ();
 
     if (conn != NULL)
-       virConnectClose (conn);
+        virConnectClose (conn);
     conn = NULL;
 
     ignorelist_free (il_domains);
@@ -846,8 +844,8 @@ void
 module_register (void)
 {
     plugin_register_config ("libvirt",
-           lv_config,
-           config_keys, NR_CONFIG_KEYS);
+    lv_config,
+    config_keys, NR_CONFIG_KEYS);
     plugin_register_init ("libvirt", lv_init);
     plugin_register_read ("libvirt", lv_read);
     plugin_register_shutdown ("libvirt", lv_shutdown);