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

cgroup: preserve correct errno on failure 

* src/util/cgroup.c (virCgroupSetValueStr, virCgroupGetValueStr)
(virCgroupRemoveRecursively): VIR_DEBUG can clobber errno.
(virCgroupRemove): Use VIR_DEBUG rather than DEBUG.
This commit is contained in:
Eric Blake 2011-02-15 16:50:34 -07:00
parent 00c9cf50c6
commit 76c57a7c1d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/cgroup.c
View File

@ -290,8 +290,8 @@ static int virCgroupSetValueStr(virCgroupPtr group,
VIR_DEBUG("Set value '%s' to '%s'", keypath, value); VIR_DEBUG("Set value '%s' to '%s'", keypath, value);
rc = virFileWriteStr(keypath, value, 0); rc = virFileWriteStr(keypath, value, 0);
if (rc < 0) { if (rc < 0) {
DEBUG("Failed to write value '%s': %m", value);
rc = -errno; rc = -errno;
VIR_DEBUG("Failed to write value '%s': %m", value);
} else { } else {
rc = 0; rc = 0;
} }
@ -313,7 +313,7 @@ static int virCgroupGetValueStr(virCgroupPtr group,
rc = virCgroupPathOfController(group, controller, key, &keypath); rc = virCgroupPathOfController(group, controller, key, &keypath);
if (rc != 0) { if (rc != 0) {
DEBUG("No path of %s, %s", group->path, key); VIR_DEBUG("No path of %s, %s", group->path, key);
return rc; return rc;
} }
@ -321,8 +321,8 @@ static int virCgroupGetValueStr(virCgroupPtr group,
rc = virFileReadAll(keypath, 1024, value); rc = virFileReadAll(keypath, 1024, value);
if (rc < 0) { if (rc < 0) {
DEBUG("Failed to read %s: %m\n", keypath);
rc = -errno; rc = -errno;
VIR_DEBUG("Failed to read %s: %m\n", keypath);
} else { } else {
/* Terminated with '\n' has sometimes harmful effects to the caller */ /* Terminated with '\n' has sometimes harmful effects to the caller */
char *p = strchr(*value, '\n'); char *p = strchr(*value, '\n');
@ -635,8 +635,8 @@ static int virCgroupRemoveRecursively(char *grppath)
if (grpdir == NULL) { if (grpdir == NULL) {
if (errno == ENOENT) if (errno == ENOENT)
return 0; return 0;
VIR_ERROR(_("Unable to open %s (%d)"), grppath, errno);
rc = -errno; rc = -errno;
VIR_ERROR(_("Unable to open %s (%d)"), grppath, errno);
return rc; return rc;
} }
@ -665,7 +665,7 @@ static int virCgroupRemoveRecursively(char *grppath)
} }
closedir(grpdir); closedir(grpdir);
DEBUG("Removing cgroup %s", grppath); VIR_DEBUG("Removing cgroup %s", grppath);
if (rmdir(grppath) != 0 && errno != ENOENT) { if (rmdir(grppath) != 0 && errno != ENOENT) {
rc = -errno; rc = -errno;
VIR_ERROR(_("Unable to remove %s (%d)"), grppath, errno); VIR_ERROR(_("Unable to remove %s (%d)"), grppath, errno);
@ -710,7 +710,7 @@ int virCgroupRemove(virCgroupPtr group)
&grppath) != 0) &grppath) != 0)
continue; continue;
DEBUG("Removing cgroup %s and all child cgroups", grppath); VIR_DEBUG("Removing cgroup %s and all child cgroups", grppath);
rc = virCgroupRemoveRecursively(grppath); rc = virCgroupRemoveRecursively(grppath);
VIR_FREE(grppath); VIR_FREE(grppath);
} }