External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

util: perf: Use 'error' label in virPerfCmtEnable

Browse Source 
The label is used only for the error path, thus rename cleanup.
This commit is contained in:
Peter Krempa 2016-04-27 14:55:12 +02:00
parent e08479efca
commit f7e7994b84
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/virperf.c
View File

@ -120,7 +120,7 @@ virPerfCmtEnable(virPerfEventPtr event,
if (virFileReadAll("/sys/devices/intel_cqm/type", if (virFileReadAll("/sys/devices/intel_cqm/type",
10, &buf) < 0) 10, &buf) < 0)
goto cleanup; goto error;
if ((tmp = strchr(buf, '\n'))) if ((tmp = strchr(buf, '\n')))
*tmp = '\0'; *tmp = '\0';
@ -128,18 +128,18 @@ virPerfCmtEnable(virPerfEventPtr event,
if (virStrToLong_ui(buf, NULL, 10, &event_type) < 0) { if (virStrToLong_ui(buf, NULL, 10, &event_type) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to get cmt event type")); _("failed to get cmt event type"));
goto cleanup; goto error;
} }
VIR_FREE(buf); VIR_FREE(buf);
if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale",
10, &buf) < 0) 10, &buf) < 0)
goto cleanup; goto error;
if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to get cmt scaling factor")); _("failed to get cmt scaling factor"));
goto cleanup; goto error;
} }
event->efields.cmt.scale = scale; event->efields.cmt.scale = scale;
@ -157,19 +157,19 @@ virPerfCmtEnable(virPerfEventPtr event,
virReportSystemError(errno, virReportSystemError(errno,
_("Unable to open perf type=%d for pid=%d"), _("Unable to open perf type=%d for pid=%d"),
event_type, pid); event_type, pid);
goto cleanup; goto error;
} }
if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("Unable to enable perf event for CMT")); _("Unable to enable perf event for CMT"));
goto cleanup; goto error;
} }
event->enabled = true; event->enabled = true;
return 0; return 0;
cleanup: error:
VIR_FORCE_CLOSE(event->fd); VIR_FORCE_CLOSE(event->fd);
VIR_FREE(buf); VIR_FREE(buf);
return -1; return -1;