X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flibvirt.c;h=6a397db3e5285829f0739ec2f1f3960e0b6362fa;hb=77ba6b7fcd1704ded65f061dbd301945f5ca4ad6;hp=f8be994eec3d2ddad8b0b081ec0e71c2dacb465a;hpb=7bf99b36d8ed91472a7f0491baaad9d4e579500a;p=collectd.git

diff --git a/src/libvirt.c b/src/libvirt.c
index f8be994e..6a397db3 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -191,6 +191,7 @@ memory_submit (gauge_t memory, virDomainPtr dom)
     vl.values_len = 1;
 
     sstrncpy (vl.type, "memory", sizeof (vl.type));
+    sstrncpy (vl.type_instance, "total", sizeof (vl.type_instance));
 
     plugin_dispatch_values (&vl);
 }
@@ -440,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]);
 
@@ -791,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;
 
@@ -826,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) {