Update of /cvsroot/sblim/gather/plugin
In directory vz-cvs-3.sog:/tmp/cvs-serv3610/plugin
Modified Files:
metricVirt.c
Log Message:
Fixed 3482867: virDomainBlkStats garbage if domain undefined
Index: metricVirt.c
===================================================================
RCS file: /cvsroot/sblim/gather/plugin/metricVirt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- metricVirt.c 1 Feb 2012 20:03:47 -0000 1.17
+++ metricVirt.c 2 Feb 2012 00:00:25 -0000 1.18
@@ -186,17 +186,18 @@
virDomainGetBlockInfo(domain, disk->source, &blkinfo, 0);
disk->capacity = blkinfo.capacity;
+ disk->read = 0;
+ disk->write = 0;
+
/* virDomainBlockStats only works on running domains */
- if (active) {
- virDomainBlockStats(domain, disk->target, &blkstats,
- sizeof(virDomainBlockStatsStruct));
+ if (active && (!virDomainBlockStats(domain,
+ disk->target,
+ &blkstats,
+ sizeof(virDomainBlockStatsStruct)))) {
/* Convert to Kilobytes */
disk->read = blkstats.rd_bytes / 1024;
disk->write = blkstats.wr_bytes / 1024;
- } else {
- disk->read = 0;
- disk->write = 0;
}
} else {
parse = 0;
|
