X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flibvirt.c;h=4cbe38d2c1f8a05d9fabd43a48c8dbb64c89c106;hb=f8379dd45f4a43595f4027992696ee8d02908bff;hp=cfabaaa235d6efe81da7896e4c51185d6afa08a3;hpb=c023314cc01ec8fae3f5373aa9dbf2b2a2d339b3;p=collectd.git

diff --git a/src/libvirt.c b/src/libvirt.c
index cfabaaa2..4cbe38d2 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -259,8 +259,8 @@ lv_init (void)
 {
     if (virInitialize () != 0)
         return -1;
-
-	return 0;
+    else
+        return 0;
 }
 
 static int
@@ -441,6 +441,12 @@ lv_read (void)
             continue;
         }
 
+        if (info.state != VIR_DOMAIN_RUNNING)
+        {
+            /* only gather stats for running domains */
+            continue;
+        }
+
         cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
         memory_submit ((gauge_t) info.memory * 1024, domains[i]);
 
@@ -792,6 +798,9 @@ add_interface_device (virDomainPtr dom, const char *path, const char *address, u
     int new_size = sizeof (interface_devices[0]) * (nr_interface_devices+1);
     char *path_copy, *address_copy, number_string[15];
 
+    if ((path == NULL) || (address == NULL))
+        return EINVAL;
+
     path_copy = strdup (path);
     if (!path_copy) return -1;
 
@@ -827,6 +836,9 @@ ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
     char *name;
     int n, r;
 
+    if ((domname == NULL) || (devpath == NULL))
+        return 0;
+
     n = sizeof (char) * (strlen (domname) + strlen (devpath) + 2);
     name = malloc (n);
     if (name == NULL) {