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

virfile: Check for existence of dir in virFileDeleteTree 

Commit id 'f1f68ca33' added code to remove the directory paths for
auto-generated sockets, but that code could be called before the
paths were created resulting in generating error messages from
virFileDeleteTree indicating that the file doesn't exist.

Rather than "enforce" all callers to make the non-NULL and existence
checks, modify the virFileDeleteTree API to silently ignore NULL on
input and non-existent directory trees.
This commit is contained in:
John Ferlan 2015-09-15 16:33:36 -04:00
parent 41d4104d3e
commit b421a70811
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_process.c
View File

@ -5269,14 +5269,12 @@ void qemuProcessStop(virQEMUDriverPtr driver,
ignore_value(virAsprintf(&tmppath, "%s/domain-%s",
cfg->libDir, vm->def->name));
if (tmppath)
virFileDeleteTree(tmppath);
virFileDeleteTree(tmppath);
VIR_FREE(tmppath);
ignore_value(virAsprintf(&tmppath, "%s/domain-%s",
cfg->channelTargetDir, vm->def->name));
if (tmppath)
virFileDeleteTree(tmppath);
virFileDeleteTree(tmppath);
VIR_FREE(tmppath);
ignore_value(virDomainChrDefForeach(vm->def,

8
src/util/virfile.c
View File

@ -934,13 +934,17 @@ int virFileNBDDeviceAssociate(const char *file,
*/
int virFileDeleteTree(const char *dir)
{
DIR *dh = opendir(dir);
DIR *dh;
struct dirent *de;
char *filepath = NULL;
int ret = -1;
int direrr;
if (!dh) {
/* Silently return 0 if passed NULL or directory doesn't exist */
if (!dir || !virFileExists(dir))
return 0;
if (!(dh = opendir(dir))) {
virReportSystemError(errno, _("Cannot open dir '%s'"),
dir);
return -1;

2
tests/virhostdevtest.c
View File

@ -65,7 +65,7 @@ myCleanup(void)
}
if (mgr) {
if (mgr->stateDir && !getenv("LIBVIRT_SKIP_CLEANUP"))
if (!getenv("LIBVIRT_SKIP_CLEANUP"))
virFileDeleteTree(mgr->stateDir);
virObjectUnref(mgr->activePCIHostdevs);

2
tests/virscsitest.c
View File

@ -241,7 +241,7 @@ mymain(void)
ret = -1;
cleanup:
if (tmpdir && getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(tmpdir);
VIR_FREE(virscsi_prefix);
return ret;