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: Refactor code for determining allocation path

Browse Source 
The code for determining resctrl allocation path could be reused
for monitor. Refactor it for reuse.

Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Wang Huaqiang 2018-11-12 21:31:34 +08:00 committed by John Ferlan
parent 4a198ed43e
commit b9df1d7607
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/util/virresctrl.c
View File

@ -2266,28 +2266,50 @@ virResctrlAllocAssign(virResctrlInfoPtr resctrl,
} }
static char *
virResctrlDeterminePath(const char *parentpath,
const char *prefix,
const char *id)
{
char *path = NULL;
if (!id) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Resctrl ID must be set before determining resctrl "
"parentpath='%s' prefix='%s'"), parentpath, prefix);
return NULL;
}
if (virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id) < 0)
return NULL;
return path;
}
int int
virResctrlAllocDeterminePath(virResctrlAllocPtr alloc, virResctrlAllocDeterminePath(virResctrlAllocPtr alloc,
const char *machinename) const char *machinename)
{ {
if (!alloc->id) { if (alloc->path) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR,
_("Resctrl Allocation ID must be set before creation")); _("Resctrl allocation path is already set to '%s'"),
alloc->path);
return -1; return -1;
} }
/* If the allocation is empty, then the path will be SYSFS_RESCTRL_PATH */ /* If the allocation is empty, then the path will be SYSFS_RESCTRL_PATH */
if (virResctrlAllocIsEmpty(alloc)) { if (virResctrlAllocIsEmpty(alloc)) {
if (!alloc->path && if (VIR_STRDUP(alloc->path, SYSFS_RESCTRL_PATH) < 0)
VIR_STRDUP(alloc->path, SYSFS_RESCTRL_PATH) < 0)
return -1; return -1;
return 0; return 0;
} }
if (!alloc->path && alloc->path = virResctrlDeterminePath(SYSFS_RESCTRL_PATH,
virAsprintf(&alloc->path, "%s/%s-%s", machinename, alloc->id);
SYSFS_RESCTRL_PATH, machinename, alloc->id) < 0)
if (!alloc->path)
return -1; return -1;
return 0; return 0;