diff --git a/src/virt.c b/src/virt.c
index 6118c0fdabddc541214294e9390f7d7112516e49..c9355c4a1cd961417ce8611befb2c1454c488bfe 100644 (file)
--- a/src/virt.c
+++ b/src/virt.c
{
if (virInitialize () != 0)
return -1;
-
- return 0;
+ else
+ return 0;
}
static int
else if (strcasecmp (fields[i], "uuid") == 0)
hostname_format[i] = hf_uuid;
else {
- sfree (value_copy);
ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
+ sfree (value_copy);
return -1;
}
}
else if (strcasecmp (fields[i], "uuid") == 0)
plugin_instance_format[i] = plginst_uuid;
else {
+ ERROR (PLUGIN_NAME " plugin: unknown PluginInstanceFormat field: %s", fields[i]);
sfree (value_copy);
- ERROR (PLUGIN_NAME " plugin: unknown HostnameFormat field: %s", fields[i]);
return -1;
}
}
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]);
}
for (j = 0; j < status; j++) {
- memory_stats_submit ((gauge_t) minfo[j].val, domains[i], minfo[j].tag);
+ memory_stats_submit ((gauge_t) minfo[j].val * 1024, domains[i], minfo[j].tag);
}
sfree (minfo);
@@ -920,6 +926,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;
@@ -955,6 +964,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) {