From 5217fe3db439e3dd66e2d657d2c0bebe0443ed22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 21 Jun 2016 17:40:37 +0200 Subject: [PATCH] Allow configs to start with a dot This fixes the disappearance of domains and networks starting with a dot. https://bugzilla.redhat.com/show_bug.cgi?id=1333248 --- src/conf/network_conf.c | 6 ------ src/conf/nwfilter_conf.c | 3 --- src/conf/storage_conf.c | 6 ------ src/conf/virdomainobjlist.c | 3 --- src/qemu/qemu_driver.c | 3 --- 5 files changed, 21 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 1e4b7198b2..e9f2f79321 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3248,9 +3248,6 @@ virNetworkLoadAllState(virNetworkObjListPtr nets, while ((ret = virDirRead(dir, &entry, stateDir)) > 0) { virNetworkObjPtr net; - if (entry->d_name[0] == '.') - continue; - if (!virFileStripSuffix(entry->d_name, ".xml")) continue; @@ -3283,9 +3280,6 @@ int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, while ((ret = virDirRead(dir, &entry, configDir)) > 0) { virNetworkObjPtr net; - if (entry->d_name[0] == '.') - continue; - if (!virFileStripSuffix(entry->d_name, ".xml")) continue; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 56f8b86f71..db92f7cd49 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3216,9 +3216,6 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters, while ((ret = virDirRead(dir, &entry, configDir)) > 0) { virNWFilterObjPtr nwfilter; - if (entry->d_name[0] == '.') - continue; - if (!virFileStripSuffix(entry->d_name, ".xml")) continue; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 5c044d2653..3c1fd02e92 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1953,9 +1953,6 @@ virStoragePoolLoadAllState(virStoragePoolObjListPtr pools, while ((ret = virDirRead(dir, &entry, stateDir)) > 0) { virStoragePoolObjPtr pool; - if (entry->d_name[0] == '.') - continue; - if (!virFileStripSuffix(entry->d_name, ".xml")) continue; @@ -1991,9 +1988,6 @@ virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, char *autostartLink; virStoragePoolObjPtr pool; - if (entry->d_name[0] == '.') - continue; - if (!virFileHasSuffix(entry->d_name, ".xml")) continue; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 4f7756d64e..46763f91bc 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -583,9 +583,6 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, while ((ret = virDirRead(dir, &entry, configDir)) > 0) { virDomainObjPtr dom; - if (entry->d_name[0] == '.') - continue; - if (!virFileStripSuffix(entry->d_name, ".xml")) continue; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9657b553a9..9973392ca8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -510,9 +510,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, } while ((direrr = virDirRead(dir, &entry, NULL)) > 0) { - if (entry->d_name[0] == '.') - continue; - /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ VIR_INFO("Loading snapshot file '%s'", entry->d_name);