diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e9f2f79321..dfa851b9d6 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3236,14 +3236,10 @@ virNetworkLoadAllState(virNetworkObjListPtr nets, DIR *dir; struct dirent *entry; int ret = -1; + int rc; - if (!(dir = opendir(stateDir))) { - if (errno == ENOENT) - return 0; - - virReportSystemError(errno, _("Failed to open dir '%s'"), stateDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, stateDir)) <= 0) + return rc; while ((ret = virDirRead(dir, &entry, stateDir)) > 0) { virNetworkObjPtr net; @@ -3267,15 +3263,10 @@ int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, DIR *dir; struct dirent *entry; int ret = -1; + int rc; - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, - _("Failed to open dir '%s'"), - configDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, configDir)) <= 0) + return rc; while ((ret = virDirRead(dir, &entry, configDir)) > 0) { virNetworkObjPtr net; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index db92f7cd49..2cdcfa74eb 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3204,14 +3204,10 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters, DIR *dir; struct dirent *entry; int ret = -1; + int rc; - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, _("Failed to open dir '%s'"), - configDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, configDir)) <= 0) + return rc; while ((ret = virDirRead(dir, &entry, configDir)) > 0) { virNWFilterObjPtr nwfilter; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 3c1fd02e92..05a1a49cee 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1941,14 +1941,10 @@ virStoragePoolLoadAllState(virStoragePoolObjListPtr pools, DIR *dir; struct dirent *entry; int ret = -1; + int rc; - if (!(dir = opendir(stateDir))) { - if (errno == ENOENT) - return 0; - - virReportSystemError(errno, _("Failed to open dir '%s'"), stateDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, stateDir)) <= 0) + return rc; while ((ret = virDirRead(dir, &entry, stateDir)) > 0) { virStoragePoolObjPtr pool; @@ -1974,14 +1970,10 @@ virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, DIR *dir; struct dirent *entry; int ret; + int rc; - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, _("Failed to open dir '%s'"), - configDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, configDir)) <= 0) + return rc; while ((ret = virDirRead(dir, &entry, configDir)) > 0) { char *path; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 46763f91bc..41c9910dc4 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -566,17 +566,12 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, DIR *dir; struct dirent *entry; int ret = -1; + int rc; VIR_INFO("Scanning for configs in %s", configDir); - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, - _("Failed to open dir '%s'"), - configDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, configDir)) <= 0) + return rc; virObjectLock(doms); diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index f4529ccd4f..30a5e80f6e 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -966,13 +966,10 @@ virSecretLoadAllConfigs(virSecretObjListPtr secrets, { DIR *dir = NULL; struct dirent *de; + int rc; - if (!(dir = opendir(configDir))) { - if (errno == ENOENT) - return 0; - virReportSystemError(errno, _("cannot open '%s'"), configDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, configDir)) <= 0) + return rc; /* Ignore errors reported by readdir or other calls within the * loop (if any). It's better to keep the secrets we managed to find. */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 728baf3e4d..58ceaf2529 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -509,15 +509,10 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver) struct dirent *entry; char *oldPath = NULL, *newPath = NULL; char *contents = NULL; + int rc; - if (!(dir = opendir(oldStateDir))) { - if (errno == ENOENT) - return 0; - - virReportSystemError(errno, _("failed to open directory '%s'"), - oldStateDir); - return -1; - } + if ((rc = virDirOpenIfExists(&dir, oldStateDir)) <= 0) + return rc; if (virFileMakePath(driver->stateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9973392ca8..713a1cd4b5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -500,14 +500,8 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_INFO("Scanning for snapshots for domain %s in %s", vm->def->name, snapDir); - if (!(dir = opendir(snapDir))) { - if (errno != ENOENT) - virReportSystemError(errno, - _("Failed to open snapshot directory %s " - "for domain %s"), - snapDir, vm->def->name); + if (virDirOpenIfExists(&dir, snapDir) <= 0) goto cleanup; - } while ((direrr = virDirRead(dir, &entry, NULL)) > 0) { /* NB: ignoring errors, so one malformed config doesn't diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e90cceee22..4c6abd96ce 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3624,15 +3624,13 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, killedAny = true; VIR_DEBUG("Iterate over children of %s (killedAny=%d)", keypath, killedAny); - if (!(dp = opendir(keypath))) { - if (errno == ENOENT) { - VIR_DEBUG("Path %s does not exist, assuming done", keypath); - killedAny = false; - goto done; - } - virReportSystemError(errno, - _("Cannot open %s"), keypath); + if ((rc = virDirOpenIfExists(&dp, keypath)) < 0) goto cleanup; + + if (rc == 0) { + VIR_DEBUG("Path %s does not exist, assuming done", keypath); + killedAny = false; + goto done; } while ((direrr = virDirRead(dp, &ent, keypath)) > 0) { diff --git a/src/util/virnuma.c b/src/util/virnuma.c index b756f7f242..fc25051b46 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -737,16 +737,10 @@ virNumaGetPages(int node, if (virNumaGetHugePageInfoDir(&path, node) < 0) goto cleanup; - if (!(dir = opendir(path))) { - /* It's okay if the @path doesn't exist. Maybe we are running on - * system without huge pages support where the path may not exist. */ - if (errno != ENOENT) { - virReportSystemError(errno, - _("unable to open path: %s"), - path); - goto cleanup; - } - } + /* It's okay if the @path doesn't exist. Maybe we are running on + * system without huge pages support where the path may not exist. */ + if (virDirOpenIfExists(&dir, path) < 0) + goto cleanup; while (dir && (direrr = virDirRead(dir, &entry, path)) > 0) { const char *page_name = entry->d_name;