From: Pierre-Yves Ritschard Date: Thu, 31 Jul 2014 21:49:35 +0000 (+0200) Subject: Merge pull request #312 from jazzmes/libvirt-mem-usage X-Git-Tag: collectd-5.5.0~237 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2761756b5ad2c9a973b30540633218202860a4d7 Merge pull request #312 from jazzmes/libvirt-mem-usage Included memory usage per VM --- 2761756b5ad2c9a973b30540633218202860a4d7 diff --cc src/libvirt.c index 7f75d243,8eec9aaf..b0c694a3 --- a/src/libvirt.c +++ b/src/libvirt.c @@@ -537,9 -477,9 +560,9 @@@ lv_read (void /* cpu map = */ NULL, /* cpu map length = */ 0); if (status < 0) { - ERROR ("libvirt plugin: virDomainGetVcpus failed with status %i.", + ERROR (PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.", status); - free (vinfo); + sfree (vinfo); continue; }