openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: Quiet the logging if perf file doesn't exist 

Commit id 'b00d7f29' shifted the opening of the /sys/devices/intel_cqm/type
file from event enable to perf event initialization. If the file did not
exist, then an error would be written to the domain log:

2016-09-06 20:51:21.677+0000: 7310: error : virFileReadAll:1360 : Failed to open file '/sys/devices/intel_cqm/type': No such file or directory

Since the error is now handled in virPerfEventEnable by checking if the
event_attr->attrType == 0 for CMT, MBML, and MBMT events - we can just
use the Quiet API in order to not log the error we're going to throw away.

Additionally, rather than using virReportSystemError, use virReportError
and VIR_ERR_ARGUMENT_UNSUPPORTED in order to signify that support isn't there
for that type of perf event - adjust the error message as well.
This commit is contained in:
John Ferlan 2016-09-06 17:20:30 -04:00
parent 69f4030aad
commit c8b8bbc366
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virperf.c
View File

@ -116,7 +116,7 @@ virPerfRdtAttrInit(void)
char *tmp = NULL; char *tmp = NULL;
unsigned int attr_type = 0; unsigned int attr_type = 0;
if (virFileReadAll("/sys/devices/intel_cqm/type", 10, &buf) < 0) if (virFileReadAllQuiet("/sys/devices/intel_cqm/type", 10, &buf) < 0)
goto error; goto error;
if ((tmp = strchr(buf, '\n'))) if ((tmp = strchr(buf, '\n')))
@ -174,8 +174,8 @@ virPerfEventEnable(virPerfPtr perf,
if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT || if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT ||
type == VIR_PERF_EVENT_MBMT || type == VIR_PERF_EVENT_MBMT ||
type == VIR_PERF_EVENT_MBML)) { type == VIR_PERF_EVENT_MBML)) {
virReportSystemError(errno, virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
_("Unable to open perf event for %s"), _("unable to enable perf event for %s"),
virPerfEventTypeToString(event->type)); virPerfEventTypeToString(event->type));
return -1; return -1;
} }