X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flibvirt.c;h=6a397db3e5285829f0739ec2f1f3960e0b6362fa;hb=e61246f70a8e81b034db36f2dd20ea0086198808;hp=cfabaaa235d6efe81da7896e4c51185d6afa08a3;hpb=344be4992285313e8855c8114993b692ae08775e;p=collectd.git diff --git a/src/libvirt.c b/src/libvirt.c index cfabaaa2..6a397db3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -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) {