- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Adjust VM id allocation
by Erik Skultety 29 Jul '15

29 Jul '15

Our atomic increment (virAtomicIntInc) uses (if available) gcc __sync_add_and_fetch builtin. In qemu driver though, we'd profit more from __sync_fetch_and_add builtin. To keep it simplistic, this patch adjusts qemu driver initialization rather than adding a new atomic increment macro. --- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 38d4a86..29049dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1492,7 +1492,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) int qemuDriverAllocateID(virQEMUDriverPtr driver) { - return virAtomicIntInc(&driver->nextvmid); + return virAtomicIntInc(&driver->lastvmid); } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 3f73929..ed9cd46 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -192,7 +192,7 @@ struct _virQEMUDriver { virThreadPoolPtr workerPool; /* Atomic increment only */ - int nextvmid; + int lastvmid; /* Atomic inc/dec only */ unsigned int nactive; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a761448..055f0ca 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -612,7 +612,7 @@ qemuDomainFindMaxID(virDomainObjPtr vm, int *driver_maxid = data; if (vm->def->id >= *driver_maxid) - *driver_maxid = vm->def->id + 1; + *driver_maxid = vm->def->id; return 0; } @@ -649,9 +649,6 @@ qemuStateInitialize(bool privileged, qemu_driver->inhibitCallback = callback; qemu_driver->inhibitOpaque = opaque; - /* Don't have a dom0 so start from 1 */ - qemu_driver->nextvmid = 1; - qemu_driver->privileged = privileged; if (!(qemu_driver->domains = virDomainObjListNew())) @@ -909,7 +906,7 @@ qemuStateInitialize(bool privileged, * threads */ virDomainObjListForEach(qemu_driver->domains, qemuDomainFindMaxID, - &qemu_driver->nextvmid); + &qemu_driver->lastvmid); virDomainObjListForEach(qemu_driver->domains, qemuDomainNetsRestart, -- 2.4.3

2 2

[libvirt] [PATCH] lxc: Don't accidentaly reset autostart flag in virLXCProcessCleanup
by Peter Krempa 28 Jul '15

28 Jul '15

virDomainDeleteConfig is meant to delete the persistent config and thus it resets vm->autostart. Copy parts of qemuProcessRemoveDomainStatus to a new helper to avoid using the incorrect function. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1230071 --- src/lxc/lxc_process.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 87ee484..e99b039 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -137,6 +137,23 @@ virLXCProcessReboot(virLXCDriverPtr driver, } +static void +lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, + virDomainObjPtr vm) +{ + char ebuf[1024]; + char *file = NULL; + + if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) + return; + + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_WARN("Failed to remove domain XML for %s: %s", + vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_FREE(file); +} + + /** * virLXCProcessCleanup: * @driver: pointer to driver structure @@ -180,7 +197,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, } virPidFileDelete(cfg->stateDir, vm->def->name); - virDomainDeleteConfig(cfg->stateDir, NULL, vm); + lxcProcessRemoveDomainStatus(cfg, vm); virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); vm->pid = -1; -- 2.4.5

2 2

[libvirt] [PATCH] conf: Split virDomainObjList into a separate file
by Michal Privoznik 28 Jul '15

28 Jul '15

Our domain_conf.* files are big enough. Not only they contain XML parsing code, but they served as a storage of all functions whose name is virDomain prefixed. This is just wrong as it gathers not related functions (and modules) into one big file which is then harder to maintain. Split virDomainObjList module into a separate file called virdomainobjlist.[ch]. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- BTW: this is the first patch of my attempt to merge virDomainObjList and virNetworkObjList together into one virObjectList as the code is pretty much duplicated between the two. I know the patch is rather big, but this all needs to be done in a single commit if we want to remain compile-able after each commit. po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/domain_conf.c | 901 ---------------------------------------- src/conf/domain_conf.h | 115 ------ src/conf/nwfilter_conf.h | 2 +- src/conf/virdomainobjlist.c | 966 +++++++++++++++++++++++++++++++++++++++++++ src/conf/virdomainobjlist.h | 146 +++++++ src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 35 +- src/libxl/libxl_conf.h | 2 +- src/openvz/openvz_conf.h | 2 +- src/test/test_driver.c | 1 + src/uml/uml_conf.h | 2 +- src/util/virclosecallbacks.h | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.h | 2 +- src/vz/vz_utils.h | 2 +- tools/virsh-domain-monitor.c | 2 +- 19 files changed, 1146 insertions(+), 1044 deletions(-) create mode 100644 src/conf/virdomainobjlist.c create mode 100644 src/conf/virdomainobjlist.h diff --git a/po/POTFILES.in b/po/POTFILES.in index a75f5ae..ea89347 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -36,6 +36,7 @@ src/conf/secret_conf.c src/conf/snapshot_conf.c src/conf/storage_conf.c src/conf/virchrdev.c +src/conf/virdomainobjlist.c src/cpu/cpu.c src/cpu/cpu_generic.c src/cpu/cpu_map.c diff --git a/src/Makefile.am b/src/Makefile.am index be63e26..4d888ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -277,7 +277,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.c conf/domain_audit.h \ conf/domain_nwfilter.c conf/domain_nwfilter.h \ conf/snapshot_conf.c conf/snapshot_conf.h \ - conf/numa_conf.c conf/numa_conf.h + conf/numa_conf.c conf/numa_conf.h \ + conf/virdomainobjlist.c conf/virdomainobjlist.h OBJECT_EVENT_SOURCES = \ conf/object_event.c conf/object_event.h \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5a9a88d..bd599f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24,7 +24,6 @@ #include <config.h> -#include <dirent.h> #include <fcntl.h> #include <sys/stat.h> #include <unistd.h> @@ -59,19 +58,6 @@ VIR_LOG_INIT("conf.domain_conf"); -struct _virDomainObjList { - virObjectLockable parent; - - /* uuid string -> virDomainObj mapping - * for O(1), lockless lookup-by-uuid */ - virHashTable *objs; - - /* name -> virDomainObj mapping for O(1), - * lockless lookup-by-name */ - virHashTable *objsName; -}; - - /* This structure holds various callbacks and data needed * while parsing and creating domain XMLs */ struct _virDomainXMLOption { @@ -804,10 +790,8 @@ VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST, "", "dimm") static virClassPtr virDomainObjClass; -static virClassPtr virDomainObjListClass; static virClassPtr virDomainXMLOptionClass; static void virDomainObjDispose(void *obj); -static void virDomainObjListDispose(void *obj); static void virDomainXMLOptionClassDispose(void *obj); static int virDomainObjOnceInit(void) @@ -818,12 +802,6 @@ static int virDomainObjOnceInit(void) virDomainObjDispose))) return -1; - if (!(virDomainObjListClass = virClassNew(virClassForObjectLockable(), - "virDomainObjList", - sizeof(virDomainObjList), - virDomainObjListDispose))) - return -1; - if (!(virDomainXMLOptionClass = virClassNew(virClassForObject(), "virDomainXMLOption", sizeof(virDomainXMLOption), @@ -1173,134 +1151,6 @@ virDomainDeviceDefCheckUnsupportedMemoryDevice(virDomainDeviceDefPtr dev) } -virDomainObjListPtr virDomainObjListNew(void) -{ - virDomainObjListPtr doms; - - if (virDomainObjInitialize() < 0) - return NULL; - - if (!(doms = virObjectLockableNew(virDomainObjListClass))) - return NULL; - - if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) || - !(doms->objsName = virHashCreate(50, virObjectFreeHashData))) { - virObjectUnref(doms); - return NULL; - } - - return doms; -} - - -static void virDomainObjListDispose(void *obj) -{ - virDomainObjListPtr doms = obj; - - virHashFree(doms->objs); - virHashFree(doms->objsName); -} - - -static int virDomainObjListSearchID(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *data) -{ - virDomainObjPtr obj = (virDomainObjPtr)payload; - const int *id = data; - int want = 0; - - virObjectLock(obj); - if (virDomainObjIsActive(obj) && - obj->def->id == *id) - want = 1; - virObjectUnlock(obj); - return want; -} - -virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, - int id) -{ - virDomainObjPtr obj; - virObjectLock(doms); - obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - obj = NULL; - } - } - virObjectUnlock(doms); - return obj; -} - - -static virDomainObjPtr -virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, - const unsigned char *uuid, - bool ref) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virDomainObjPtr obj; - - virObjectLock(doms); - virUUIDFormat(uuid, uuidstr); - - obj = virHashLookup(doms->objs, uuidstr); - if (ref) { - virObjectRef(obj); - virObjectUnlock(doms); - } - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - if (ref) - virObjectUnref(obj); - obj = NULL; - } - } - if (!ref) - virObjectUnlock(doms); - return obj; -} - -virDomainObjPtr -virDomainObjListFindByUUID(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, false); -} - -virDomainObjPtr -virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, true); -} - -virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, - const char *name) -{ - virDomainObjPtr obj; - - virObjectLock(doms); - obj = virHashLookup(doms->objsName, name); - virObjectRef(obj); - virObjectUnlock(doms); - if (obj) { - virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj = NULL; - } - } - return obj; -} - - bool virDomainObjTaint(virDomainObjPtr obj, virDomainTaintFlags taint) { @@ -2705,118 +2555,6 @@ virDomainObjWaitUntil(virDomainObjPtr vm, /* - * - * If flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE then - * this will refuse updating an existing def if the - * current def is Live - * - * If flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE then - * the @def being added is assumed to represent a - * live config, not a future inactive config - * - */ -static virDomainObjPtr -virDomainObjListAddLocked(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef) -{ - virDomainObjPtr vm; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - if (oldDef) - *oldDef = NULL; - - virUUIDFormat(def->uuid, uuidstr); - - /* See if a VM with matching UUID already exists */ - if ((vm = virHashLookup(doms->objs, uuidstr))) { - virObjectLock(vm); - /* UUID matches, but if names don't match, refuse it */ - if (STRNEQ(vm->def->name, def->name)) { - virUUIDFormat(vm->def->uuid, uuidstr); - virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' is already defined with uuid %s"), - vm->def->name, uuidstr); - goto error; - } - - if (flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE) { - /* UUID & name match, but if VM is already active, refuse it */ - if (virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already active"), - vm->def->name); - goto error; - } - if (!vm->persistent) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already being started"), - vm->def->name); - goto error; - } - } - - virDomainObjAssignDef(vm, - def, - !!(flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE), - oldDef); - } else { - /* UUID does not match, but if a name matches, refuse it */ - if ((vm = virHashLookup(doms->objsName, def->name))) { - virObjectLock(vm); - virUUIDFormat(vm->def->uuid, uuidstr); - virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' already exists with uuid %s"), - def->name, uuidstr); - goto error; - } - - if (!(vm = virDomainObjNew(xmlopt))) - goto cleanup; - vm->def = def; - - virUUIDFormat(def->uuid, uuidstr); - if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { - virObjectUnref(vm); - return NULL; - } - - if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { - virHashRemoveEntry(doms->objs, uuidstr); - return NULL; - } - - /* Since domain is in two hash tables, increment the - * reference counter */ - virObjectRef(vm); - } - cleanup: - return vm; - - error: - virObjectUnlock(vm); - vm = NULL; - goto cleanup; -} - - -virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef) -{ - virDomainObjPtr ret; - - virObjectLock(doms); - ret = virDomainObjListAddLocked(doms, def, xmlopt, flags, oldDef); - virObjectUnlock(doms); - return ret; -} - -/* * Mark the running VM config as transient. Ensures transient hotplug * operations do not persist past shutdown. * @@ -3037,48 +2775,6 @@ virDomainObjGetOneDef(virDomainObjPtr vm, } -/* - * The caller must hold a lock on the driver owning 'doms', - * and must also have locked 'dom', to ensure no one else - * is either waiting for 'dom' or still using it - */ -void virDomainObjListRemove(virDomainObjListPtr doms, - virDomainObjPtr dom) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - dom->removing = true; - virUUIDFormat(dom->def->uuid, uuidstr); - virObjectRef(dom); - virObjectUnlock(dom); - - virObjectLock(doms); - virObjectLock(dom); - virHashRemoveEntry(doms->objs, uuidstr); - virHashRemoveEntry(doms->objsName, dom->def->name); - virObjectUnlock(dom); - virObjectUnref(dom); - virObjectUnlock(doms); -} - -/* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' - * requirements - * - * Can be used to remove current element while iterating with - * virDomainObjListForEach - */ -void virDomainObjListRemoveLocked(virDomainObjListPtr doms, - virDomainObjPtr dom) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - virUUIDFormat(dom->def->uuid, uuidstr); - - virHashRemoveEntry(doms->objs, uuidstr); - virHashRemoveEntry(doms->objsName, dom->def->name); - virObjectUnlock(dom); -} - static int virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { @@ -22296,180 +21992,6 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, } -static virDomainObjPtr -virDomainObjListLoadConfig(virDomainObjListPtr doms, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - const char *configDir, - const char *autostartDir, - const char *name, - virDomainLoadConfigNotify notify, - void *opaque) -{ - char *configFile = NULL, *autostartLink = NULL; - virDomainDefPtr def = NULL; - virDomainObjPtr dom; - int autostart; - virDomainDefPtr oldDef = NULL; - - if ((configFile = virDomainConfigFile(configDir, name)) == NULL) - goto error; - if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) - goto error; - - if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) - goto error; - - if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) - goto error; - - if (!(dom = virDomainObjListAddLocked(doms, def, xmlopt, 0, &oldDef))) - goto error; - - dom->autostart = autostart; - - if (notify) - (*notify)(dom, oldDef == NULL, opaque); - - virDomainDefFree(oldDef); - VIR_FREE(configFile); - VIR_FREE(autostartLink); - return dom; - - error: - VIR_FREE(configFile); - VIR_FREE(autostartLink); - virDomainDefFree(def); - return NULL; -} - -static virDomainObjPtr -virDomainObjListLoadStatus(virDomainObjListPtr doms, - const char *statusDir, - const char *name, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque) -{ - char *statusFile = NULL; - virDomainObjPtr obj = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL) - goto error; - - if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, - VIR_DOMAIN_DEF_PARSE_STATUS | - VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | - VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | - VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST | - VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) - goto error; - - virUUIDFormat(obj->def->uuid, uuidstr); - - if (virHashLookup(doms->objs, uuidstr) != NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected domain %s already exists"), - obj->def->name); - goto error; - } - - if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) - goto error; - - if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) { - virHashRemoveEntry(doms->objs, uuidstr); - goto error; - } - - /* Since domain is in two hash tables, increment the - * reference counter */ - virObjectRef(obj); - - if (notify) - (*notify)(obj, 1, opaque); - - VIR_FREE(statusFile); - return obj; - - error: - virObjectUnref(obj); - VIR_FREE(statusFile); - return NULL; -} - -int -virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, - const char *configDir, - const char *autostartDir, - int liveStatus, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque) -{ - DIR *dir; - struct dirent *entry; - int ret = -1; - - 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; - } - - virObjectLock(doms); - - while ((ret = virDirRead(dir, &entry, configDir)) > 0) { - virDomainObjPtr dom; - - if (entry->d_name[0] == '.') - continue; - - if (!virFileStripSuffix(entry->d_name, ".xml")) - continue; - - /* NB: ignoring errors, so one malformed config doesn't - kill the whole process */ - VIR_INFO("Loading config file '%s.xml'", entry->d_name); - if (liveStatus) - dom = virDomainObjListLoadStatus(doms, - configDir, - entry->d_name, - caps, - xmlopt, - notify, - opaque); - else - dom = virDomainObjListLoadConfig(doms, - caps, - xmlopt, - configDir, - autostartDir, - entry->d_name, - notify, - opaque); - if (dom) { - if (!liveStatus) - dom->persistent = 1; - virObjectUnlock(dom); - } - } - - closedir(dir); - virObjectUnlock(doms); - return ret; -} - int virDomainDeleteConfig(const char *configDir, const char *autostartDir, @@ -22586,178 +22108,6 @@ virDomainGetFilesystemForTarget(virDomainDefPtr def, } -struct virDomainObjListData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - bool active; - int count; -}; - -static void -virDomainObjListCount(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainObjListData *data = opaque; - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (virDomainObjIsActive(obj)) { - if (data->active) - data->count++; - } else { - if (!data->active) - data->count++; - } - cleanup: - virObjectUnlock(obj); -} - -int -virDomainObjListNumOfDomains(virDomainObjListPtr doms, - bool active, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainObjListData data = { filter, conn, active, 0 }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCount, &data); - virObjectUnlock(doms); - return data.count; -} - -struct virDomainIDData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - int numids; - int maxids; - int *ids; -}; - -static void -virDomainObjListCopyActiveIDs(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainIDData *data = opaque; - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (virDomainObjIsActive(obj) && data->numids < data->maxids) - data->ids[data->numids++] = obj->def->id; - cleanup: - virObjectUnlock(obj); -} - -int -virDomainObjListGetActiveIDs(virDomainObjListPtr doms, - int *ids, - int maxids, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainIDData data = { filter, conn, - 0, maxids, ids }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data); - virObjectUnlock(doms); - return data.numids; -} - -struct virDomainNameData { - virDomainObjListACLFilter filter; - virConnectPtr conn; - int oom; - int numnames; - int maxnames; - char **const names; -}; - -static void -virDomainObjListCopyInactiveNames(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - virDomainObjPtr obj = payload; - struct virDomainNameData *data = opaque; - - if (data->oom) - return; - - virObjectLock(obj); - if (data->filter && - !data->filter(data->conn, obj->def)) - goto cleanup; - if (!virDomainObjIsActive(obj) && data->numnames < data->maxnames) { - if (VIR_STRDUP(data->names[data->numnames], obj->def->name) < 0) - data->oom = 1; - else - data->numnames++; - } - cleanup: - virObjectUnlock(obj); -} - - -int -virDomainObjListGetInactiveNames(virDomainObjListPtr doms, - char **const names, - int maxnames, - virDomainObjListACLFilter filter, - virConnectPtr conn) -{ - struct virDomainNameData data = { filter, conn, - 0, 0, maxnames, names }; - size_t i; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); - virObjectUnlock(doms); - if (data.oom) { - for (i = 0; i < data.numnames; i++) - VIR_FREE(data.names[i]); - return -1; - } - - return data.numnames; -} - - -struct virDomainListIterData { - virDomainObjListIterator callback; - void *opaque; - int ret; -}; - -static void -virDomainObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - struct virDomainListIterData *data = opaque; - - if (data->callback(payload, data->opaque) < 0) - data->ret = -1; -} - -int -virDomainObjListForEach(virDomainObjListPtr doms, - virDomainObjListIterator callback, - void *opaque) -{ - struct virDomainListIterData data = { - callback, opaque, 0, - }; - virObjectLock(doms); - virHashForEach(doms->objs, virDomainObjListHelper, &data); - virObjectUnlock(doms); - return data.ret; -} - - int virDomainChrDefForeach(virDomainDefPtr def, bool abortOnError, @@ -23472,257 +22822,6 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, } -#define MATCH(FLAG) (filter & (FLAG)) -static bool -virDomainObjMatchFilter(virDomainObjPtr vm, - unsigned int filter) -{ - /* filter by active state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE) && - virDomainObjIsActive(vm)) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE) && - !virDomainObjIsActive(vm)))) - return false; - - /* filter by persistence */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && - vm->persistent) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && - !vm->persistent))) - return false; - - /* filter by domain state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { - int st = virDomainObjGetState(vm, NULL); - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && - st == VIR_DOMAIN_RUNNING) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && - st == VIR_DOMAIN_PAUSED) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && - st == VIR_DOMAIN_SHUTOFF) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && - (st != VIR_DOMAIN_RUNNING && - st != VIR_DOMAIN_PAUSED && - st != VIR_DOMAIN_SHUTOFF)))) - return false; - } - - /* filter by existence of managed save state */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && - vm->hasManagedSave) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && - !vm->hasManagedSave))) - return false; - - /* filter by autostart option */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART) && - !((MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && vm->autostart) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !vm->autostart))) - return false; - - /* filter by snapshot existence */ - if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { - int nsnap = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0); - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || - (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap <= 0))) - return false; - } - - return true; -} -#undef MATCH - - -struct virDomainListData { - virDomainObjPtr *vms; - size_t nvms; -}; - - -static void -virDomainObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque) -{ - struct virDomainListData *data = opaque; - - data->vms[data->nvms++] = virObjectRef(payload); -} - - -static void -virDomainObjListFilter(virDomainObjPtr **list, - size_t *nvms, - virConnectPtr conn, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - size_t i = 0; - - while (i < *nvms) { - virDomainObjPtr vm = (*list)[i]; - - virObjectLock(vm); - - /* do not list the object if: - * 1) it's being removed. - * 2) connection does not have ACL to see it - * 3) it doesn't match the filter - */ - if (vm->removing || - (filter && !filter(conn, vm->def)) || - !virDomainObjMatchFilter(vm, flags)) { - virObjectUnlock(vm); - virObjectUnref(vm); - VIR_DELETE_ELEMENT(*list, i, *nvms); - continue; - } - - virObjectUnlock(vm); - i++; - } -} - - -int -virDomainObjListCollect(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - struct virDomainListData data = { NULL, 0 }; - - virObjectLock(domlist); - sa_assert(domlist->objs); - if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { - virObjectUnlock(domlist); - return -1; - } - - virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); - virObjectUnlock(domlist); - - virDomainObjListFilter(&data.vms, &data.nvms, conn, filter, flags); - - *nvms = data.nvms; - *vms = data.vms; - - return 0; -} - - -int -virDomainObjListConvert(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr *doms, - size_t ndoms, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags, - bool skip_missing) -{ - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virDomainObjPtr vm; - size_t i; - - *nvms = 0; - *vms = NULL; - - virObjectLock(domlist); - for (i = 0; i < ndoms; i++) { - virDomainPtr dom = doms[i]; - - virUUIDFormat(dom->uuid, uuidstr); - - if (!(vm = virHashLookup(domlist->objs, uuidstr))) { - if (skip_missing) - continue; - - virObjectUnlock(domlist); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), - uuidstr, dom->name); - goto error; - } - - virObjectRef(vm); - - if (VIR_APPEND_ELEMENT(*vms, *nvms, vm) < 0) { - virObjectUnlock(domlist); - virObjectUnref(vm); - goto error; - } - } - virObjectUnlock(domlist); - - sa_assert(*vms); - virDomainObjListFilter(vms, nvms, conn, filter, flags); - - return 0; - - error: - virObjectListFreeCount(*vms, *nvms); - *vms = NULL; - *nvms = 0; - - return -1; -} - - -int -virDomainObjListExport(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr **domains, - virDomainObjListACLFilter filter, - unsigned int flags) -{ - virDomainObjPtr *vms = NULL; - virDomainPtr *doms = NULL; - size_t nvms = 0; - size_t i; - int ret = -1; - - if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0) - return -1; - - if (domains) { - if (VIR_ALLOC_N(doms, nvms + 1) < 0) - goto cleanup; - - for (i = 0; i < nvms; i++) { - virDomainObjPtr vm = vms[i]; - - virObjectLock(vm); - - if (!(doms[i] = virGetDomain(conn, vm->def->name, vm->def->uuid))) { - virObjectUnlock(vm); - goto cleanup; - } - - doms[i]->id = vm->def->id; - - virObjectUnlock(vm); - } - - *domains = doms; - doms = NULL; - } - - ret = nvms; - - cleanup: - virObjectListFree(doms); - virObjectListFreeCount(vms, nvms); - return ret; -} - - virSecurityLabelDefPtr virDomainDefGetSecurityLabelDef(virDomainDefPtr def, const char *model) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 50750c1..df63a4e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2345,9 +2345,6 @@ struct _virDomainObj { int taint; }; -typedef struct _virDomainObjList virDomainObjList; -typedef virDomainObjList *virDomainObjListPtr; - typedef bool (*virDomainObjListACLFilter)(virConnectPtr conn, virDomainDefPtr def); @@ -2427,17 +2424,6 @@ virDomainObjIsActive(virDomainObjPtr dom) virDomainObjPtr virDomainObjNew(virDomainXMLOptionPtr caps) ATTRIBUTE_NONNULL(1); -virDomainObjListPtr virDomainObjListNew(void); - -virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, - int id); -virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, - const unsigned char *uuid); -virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid); -virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, - const char *name); - void virDomainObjEndAPI(virDomainObjPtr *vm); bool virDomainObjTaint(virDomainObjPtr obj, @@ -2534,15 +2520,6 @@ virDomainDefPtr virDomainDefNewFull(const char *name, const unsigned char *uuid, int id); -enum { - VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1), -}; -virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, - virDomainDefPtr def, - virDomainXMLOptionPtr xmlopt, - unsigned int flags, - virDomainDefPtr *oldDef); void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, bool live, @@ -2580,11 +2557,6 @@ virDomainDefPtr virDomainObjCopyPersistentDef(virDomainObjPtr dom, virCapsPtr caps, virDomainXMLOptionPtr xmlopt); -void virDomainObjListRemove(virDomainObjListPtr doms, - virDomainObjPtr dom); -void virDomainObjListRemoveLocked(virDomainObjListPtr doms, - virDomainObjPtr dom); - typedef enum { /* parse internal domain status information */ VIR_DOMAIN_DEF_PARSE_STATUS = 1 << 0, @@ -2847,15 +2819,6 @@ typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, void *opaque); -int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, - const char *configDir, - const char *autostartDir, - int liveStatus, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - virDomainLoadConfigNotify notify, - void *opaque); - int virDomainDeleteConfig(const char *configDir, const char *autostartDir, virDomainObjPtr dom); @@ -2877,29 +2840,6 @@ int virDomainVideoDefaultType(const virDomainDef *def); unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, const virDomainVideoType type); -int virDomainObjListNumOfDomains(virDomainObjListPtr doms, - bool active, - virDomainObjListACLFilter filter, - virConnectPtr conn); - -int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, - int *ids, - int maxids, - virDomainObjListACLFilter filter, - virConnectPtr conn); -int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, - char **const names, - int maxnames, - virDomainObjListACLFilter filter, - virConnectPtr conn); - -typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, - void *opaque); - -int virDomainObjListForEach(virDomainObjListPtr doms, - virDomainObjListIterator callback, - void *opaque); - typedef int (*virDomainSmartcardDefIterator)(virDomainDefPtr def, virDomainSmartcardDefPtr dev, void *opaque); @@ -3054,61 +2994,6 @@ VIR_ENUM_DECL(virDomainCpuPlacementMode) VIR_ENUM_DECL(virDomainStartupPolicy) -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ - (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ - VIR_CONNECT_LIST_DOMAINS_INACTIVE) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \ - (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \ - VIR_CONNECT_LIST_DOMAINS_TRANSIENT) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \ - (VIR_CONNECT_LIST_DOMAINS_RUNNING | \ - VIR_CONNECT_LIST_DOMAINS_PAUSED | \ - VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \ - VIR_CONNECT_LIST_DOMAINS_OTHER) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \ - (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \ - VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \ - (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \ - VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \ - (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \ - VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) - -# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \ - (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART | \ - VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT) - -int virDomainObjListCollect(virDomainObjListPtr doms, - virConnectPtr conn, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags); -int virDomainObjListExport(virDomainObjListPtr doms, - virConnectPtr conn, - virDomainPtr **domains, - virDomainObjListACLFilter filter, - unsigned int flags); -int virDomainObjListConvert(virDomainObjListPtr domlist, - virConnectPtr conn, - virDomainPtr *doms, - size_t ndoms, - virDomainObjPtr **vms, - size_t *nvms, - virDomainObjListACLFilter filter, - unsigned int flags, - bool skip_missing); - int virDomainDefMaybeAddController(virDomainDefPtr def, int type, diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 6e68ecc..0211861 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -33,7 +33,7 @@ # include "virbuffer.h" # include "virsocketaddr.h" # include "virmacaddr.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" /* XXX * The config parser/structs should not be using platform specific diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c new file mode 100644 index 0000000..f1b548d --- /dev/null +++ b/src/conf/virdomainobjlist.c @@ -0,0 +1,966 @@ +/* + * virdomainobjlist.c: domain objects list utilities + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "internal.h" +#include "datatypes.h" +#include "virdomainobjlist.h" +#include "snapshot_conf.h" +#include "viralloc.h" +#include "virfile.h" +#include "virlog.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_DOMAIN + +VIR_LOG_INIT("conf.virdomainobjlist"); + +static virClassPtr virDomainObjListClass; +static void virDomainObjListDispose(void *obj); + + +struct _virDomainObjList { + virObjectLockable parent; + + /* uuid string -> virDomainObj mapping + * for O(1), lockless lookup-by-uuid */ + virHashTable *objs; + + /* name -> virDomainObj mapping for O(1), + * lockless lookup-by-name */ + virHashTable *objsName; +}; + + +static int virDomainObjListOnceInit(void) +{ + if (!(virDomainObjListClass = virClassNew(virClassForObjectLockable(), + "virDomainObjList", + sizeof(virDomainObjList), + virDomainObjListDispose))) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virDomainObjList) + +virDomainObjListPtr virDomainObjListNew(void) +{ + virDomainObjListPtr doms; + + if (virDomainObjListInitialize() < 0) + return NULL; + + if (!(doms = virObjectLockableNew(virDomainObjListClass))) + return NULL; + + if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) || + !(doms->objsName = virHashCreate(50, virObjectFreeHashData))) { + virObjectUnref(doms); + return NULL; + } + + return doms; +} + + +static void virDomainObjListDispose(void *obj) +{ + virDomainObjListPtr doms = obj; + + virHashFree(doms->objs); + virHashFree(doms->objsName); +} + + +static int virDomainObjListSearchID(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *data) +{ + virDomainObjPtr obj = (virDomainObjPtr)payload; + const int *id = data; + int want = 0; + + virObjectLock(obj); + if (virDomainObjIsActive(obj) && + obj->def->id == *id) + want = 1; + virObjectUnlock(obj); + return want; +} + + +virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, + int id) +{ + virDomainObjPtr obj; + virObjectLock(doms); + obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + obj = NULL; + } + } + virObjectUnlock(doms); + return obj; +} + + +static virDomainObjPtr +virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, + const unsigned char *uuid, + bool ref) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virDomainObjPtr obj; + + virObjectLock(doms); + virUUIDFormat(uuid, uuidstr); + + obj = virHashLookup(doms->objs, uuidstr); + if (ref) { + virObjectRef(obj); + virObjectUnlock(doms); + } + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + if (ref) + virObjectUnref(obj); + obj = NULL; + } + } + if (!ref) + virObjectUnlock(doms); + return obj; +} + + +virDomainObjPtr +virDomainObjListFindByUUID(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternal(doms, uuid, false); +} + + +virDomainObjPtr +virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternal(doms, uuid, true); +} + + +virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, + const char *name) +{ + virDomainObjPtr obj; + + virObjectLock(doms); + obj = virHashLookup(doms->objsName, name); + virObjectRef(obj); + virObjectUnlock(doms); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + virObjectUnref(obj); + obj = NULL; + } + } + return obj; +} + + +/* + * virDomainObjListAddLocked: + * + * If flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE then + * this will refuse updating an existing def if the + * current def is Live + * + * If flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE then + * the @def being added is assumed to represent a + * live config, not a future inactive config + * + */ +static virDomainObjPtr +virDomainObjListAddLocked(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef) +{ + virDomainObjPtr vm; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if (oldDef) + *oldDef = NULL; + + virUUIDFormat(def->uuid, uuidstr); + + /* See if a VM with matching UUID already exists */ + if ((vm = virHashLookup(doms->objs, uuidstr))) { + virObjectLock(vm); + /* UUID matches, but if names don't match, refuse it */ + if (STRNEQ(vm->def->name, def->name)) { + virUUIDFormat(vm->def->uuid, uuidstr); + virReportError(VIR_ERR_OPERATION_FAILED, + _("domain '%s' is already defined with uuid %s"), + vm->def->name, uuidstr); + goto error; + } + + if (flags & VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE) { + /* UUID & name match, but if VM is already active, refuse it */ + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain '%s' is already active"), + vm->def->name); + goto error; + } + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain '%s' is already being started"), + vm->def->name); + goto error; + } + } + + virDomainObjAssignDef(vm, + def, + !!(flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE), + oldDef); + } else { + /* UUID does not match, but if a name matches, refuse it */ + if ((vm = virHashLookup(doms->objsName, def->name))) { + virObjectLock(vm); + virUUIDFormat(vm->def->uuid, uuidstr); + virReportError(VIR_ERR_OPERATION_FAILED, + _("domain '%s' already exists with uuid %s"), + def->name, uuidstr); + goto error; + } + + if (!(vm = virDomainObjNew(xmlopt))) + goto cleanup; + vm->def = def; + + virUUIDFormat(def->uuid, uuidstr); + if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { + virObjectUnref(vm); + return NULL; + } + + if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { + virHashRemoveEntry(doms->objs, uuidstr); + return NULL; + } + + /* Since domain is in two hash tables, increment the + * reference counter */ + virObjectRef(vm); + } + cleanup: + return vm; + + error: + virObjectUnlock(vm); + vm = NULL; + goto cleanup; +} + + +virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef) +{ + virDomainObjPtr ret; + + virObjectLock(doms); + ret = virDomainObjListAddLocked(doms, def, xmlopt, flags, oldDef); + virObjectUnlock(doms); + return ret; +} + + +/* + * The caller must hold a lock on the driver owning 'doms', + * and must also have locked 'dom', to ensure no one else + * is either waiting for 'dom' or still using it + */ +void virDomainObjListRemove(virDomainObjListPtr doms, + virDomainObjPtr dom) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + dom->removing = true; + virUUIDFormat(dom->def->uuid, uuidstr); + virObjectRef(dom); + virObjectUnlock(dom); + + virObjectLock(doms); + virObjectLock(dom); + virHashRemoveEntry(doms->objs, uuidstr); + virHashRemoveEntry(doms->objsName, dom->def->name); + virObjectUnlock(dom); + virObjectUnref(dom); + virObjectUnlock(doms); +} + + +/* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' + * requirements + * + * Can be used to remove current element while iterating with + * virDomainObjListForEach + */ +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->def->uuid, uuidstr); + + virHashRemoveEntry(doms->objs, uuidstr); + virHashRemoveEntry(doms->objsName, dom->def->name); + virObjectUnlock(dom); +} + + +static virDomainObjPtr +virDomainObjListLoadConfig(virDomainObjListPtr doms, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + const char *configDir, + const char *autostartDir, + const char *name, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *configFile = NULL, *autostartLink = NULL; + virDomainDefPtr def = NULL; + virDomainObjPtr dom; + int autostart; + virDomainDefPtr oldDef = NULL; + + if ((configFile = virDomainConfigFile(configDir, name)) == NULL) + goto error; + if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) + goto error; + + if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) + goto error; + + if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) + goto error; + + if (!(dom = virDomainObjListAddLocked(doms, def, xmlopt, 0, &oldDef))) + goto error; + + dom->autostart = autostart; + + if (notify) + (*notify)(dom, oldDef == NULL, opaque); + + virDomainDefFree(oldDef); + VIR_FREE(configFile); + VIR_FREE(autostartLink); + return dom; + + error: + VIR_FREE(configFile); + VIR_FREE(autostartLink); + virDomainDefFree(def); + return NULL; +} + + +static virDomainObjPtr +virDomainObjListLoadStatus(virDomainObjListPtr doms, + const char *statusDir, + const char *name, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *statusFile = NULL; + virDomainObjPtr obj = NULL; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if ((statusFile = virDomainConfigFile(statusDir, name)) == NULL) + goto error; + + if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, + VIR_DOMAIN_DEF_PARSE_STATUS | + VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | + VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES | + VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS))) + goto error; + + virUUIDFormat(obj->def->uuid, uuidstr); + + if (virHashLookup(doms->objs, uuidstr) != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected domain %s already exists"), + obj->def->name); + goto error; + } + + if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) + goto error; + + if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) { + virHashRemoveEntry(doms->objs, uuidstr); + goto error; + } + + /* Since domain is in two hash tables, increment the + * reference counter */ + virObjectRef(obj); + + if (notify) + (*notify)(obj, 1, opaque); + + VIR_FREE(statusFile); + return obj; + + error: + virObjectUnref(obj); + VIR_FREE(statusFile); + return NULL; +} + + +int +virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, + const char *configDir, + const char *autostartDir, + int liveStatus, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque) +{ + DIR *dir; + struct dirent *entry; + int ret = -1; + + 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; + } + + virObjectLock(doms); + + while ((ret = virDirRead(dir, &entry, configDir)) > 0) { + virDomainObjPtr dom; + + if (entry->d_name[0] == '.') + continue; + + if (!virFileStripSuffix(entry->d_name, ".xml")) + continue; + + /* NB: ignoring errors, so one malformed config doesn't + kill the whole process */ + VIR_INFO("Loading config file '%s.xml'", entry->d_name); + if (liveStatus) + dom = virDomainObjListLoadStatus(doms, + configDir, + entry->d_name, + caps, + xmlopt, + notify, + opaque); + else + dom = virDomainObjListLoadConfig(doms, + caps, + xmlopt, + configDir, + autostartDir, + entry->d_name, + notify, + opaque); + if (dom) { + if (!liveStatus) + dom->persistent = 1; + virObjectUnlock(dom); + } + } + + closedir(dir); + virObjectUnlock(doms); + return ret; +} + + +struct virDomainObjListData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + bool active; + int count; +}; + + +static void +virDomainObjListCount(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainObjListData *data = opaque; + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (virDomainObjIsActive(obj)) { + if (data->active) + data->count++; + } else { + if (!data->active) + data->count++; + } + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListNumOfDomains(virDomainObjListPtr doms, + bool active, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainObjListData data = { filter, conn, active, 0 }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCount, &data); + virObjectUnlock(doms); + return data.count; +} + + +struct virDomainIDData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + int numids; + int maxids; + int *ids; +}; + + +static void +virDomainObjListCopyActiveIDs(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainIDData *data = opaque; + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (virDomainObjIsActive(obj) && data->numids < data->maxids) + data->ids[data->numids++] = obj->def->id; + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListGetActiveIDs(virDomainObjListPtr doms, + int *ids, + int maxids, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainIDData data = { filter, conn, + 0, maxids, ids }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCopyActiveIDs, &data); + virObjectUnlock(doms); + return data.numids; +} + + +struct virDomainNameData { + virDomainObjListACLFilter filter; + virConnectPtr conn; + int oom; + int numnames; + int maxnames; + char **const names; +}; + + +static void +virDomainObjListCopyInactiveNames(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr obj = payload; + struct virDomainNameData *data = opaque; + + if (data->oom) + return; + + virObjectLock(obj); + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + if (!virDomainObjIsActive(obj) && data->numnames < data->maxnames) { + if (VIR_STRDUP(data->names[data->numnames], obj->def->name) < 0) + data->oom = 1; + else + data->numnames++; + } + cleanup: + virObjectUnlock(obj); +} + + +int +virDomainObjListGetInactiveNames(virDomainObjListPtr doms, + char **const names, + int maxnames, + virDomainObjListACLFilter filter, + virConnectPtr conn) +{ + struct virDomainNameData data = { filter, conn, + 0, 0, maxnames, names }; + size_t i; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data); + virObjectUnlock(doms); + if (data.oom) { + for (i = 0; i < data.numnames; i++) + VIR_FREE(data.names[i]); + return -1; + } + + return data.numnames; +} + + +struct virDomainListIterData { + virDomainObjListIterator callback; + void *opaque; + int ret; +}; + + +static void +virDomainObjListHelper(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virDomainListIterData *data = opaque; + + if (data->callback(payload, data->opaque) < 0) + data->ret = -1; +} + + +int +virDomainObjListForEach(virDomainObjListPtr doms, + virDomainObjListIterator callback, + void *opaque) +{ + struct virDomainListIterData data = { + callback, opaque, 0, + }; + virObjectLock(doms); + virHashForEach(doms->objs, virDomainObjListHelper, &data); + virObjectUnlock(doms); + return data.ret; +} + + +#define MATCH(FLAG) (filter & (FLAG)) +static bool +virDomainObjMatchFilter(virDomainObjPtr vm, + unsigned int filter) +{ + /* filter by active state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_ACTIVE) && + virDomainObjIsActive(vm)) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_INACTIVE) && + !virDomainObjIsActive(vm)))) + return false; + + /* filter by persistence */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT) && + vm->persistent) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && + !vm->persistent))) + return false; + + /* filter by domain state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { + int st = virDomainObjGetState(vm, NULL); + if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && + st == VIR_DOMAIN_RUNNING) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && + st == VIR_DOMAIN_PAUSED) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_SHUTOFF) && + st == VIR_DOMAIN_SHUTOFF) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_OTHER) && + (st != VIR_DOMAIN_RUNNING && + st != VIR_DOMAIN_PAUSED && + st != VIR_DOMAIN_SHUTOFF)))) + return false; + } + + /* filter by existence of managed save state */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && + vm->hasManagedSave) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) && + !vm->hasManagedSave))) + return false; + + /* filter by autostart option */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART) && + !((MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && vm->autostart) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && !vm->autostart))) + return false; + + /* filter by snapshot existence */ + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + int nsnap = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0); + if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && nsnap > 0) || + (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && nsnap <= 0))) + return false; + } + + return true; +} +#undef MATCH + + +struct virDomainListData { + virDomainObjPtr *vms; + size_t nvms; +}; + + +static void +virDomainObjListCollectIterator(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virDomainListData *data = opaque; + + data->vms[data->nvms++] = virObjectRef(payload); +} + + +static void +virDomainObjListFilter(virDomainObjPtr **list, + size_t *nvms, + virConnectPtr conn, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + size_t i = 0; + + while (i < *nvms) { + virDomainObjPtr vm = (*list)[i]; + + virObjectLock(vm); + + /* do not list the object if: + * 1) it's being removed. + * 2) connection does not have ACL to see it + * 3) it doesn't match the filter + */ + if (vm->removing || + (filter && !filter(conn, vm->def)) || + !virDomainObjMatchFilter(vm, flags)) { + virObjectUnlock(vm); + virObjectUnref(vm); + VIR_DELETE_ELEMENT(*list, i, *nvms); + continue; + } + + virObjectUnlock(vm); + i++; + } +} + + +int +virDomainObjListCollect(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + struct virDomainListData data = { NULL, 0 }; + + virObjectLock(domlist); + sa_assert(domlist->objs); + if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { + virObjectUnlock(domlist); + return -1; + } + + virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); + virObjectUnlock(domlist); + + virDomainObjListFilter(&data.vms, &data.nvms, conn, filter, flags); + + *nvms = data.nvms; + *vms = data.vms; + + return 0; +} + + +int +virDomainObjListConvert(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr *doms, + size_t ndoms, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags, + bool skip_missing) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virDomainObjPtr vm; + size_t i; + + *nvms = 0; + *vms = NULL; + + virObjectLock(domlist); + for (i = 0; i < ndoms; i++) { + virDomainPtr dom = doms[i]; + + virUUIDFormat(dom->uuid, uuidstr); + + if (!(vm = virHashLookup(domlist->objs, uuidstr))) { + if (skip_missing) + continue; + + virObjectUnlock(domlist); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, dom->name); + goto error; + } + + virObjectRef(vm); + + if (VIR_APPEND_ELEMENT(*vms, *nvms, vm) < 0) { + virObjectUnlock(domlist); + virObjectUnref(vm); + goto error; + } + } + virObjectUnlock(domlist); + + sa_assert(*vms); + virDomainObjListFilter(vms, nvms, conn, filter, flags); + + return 0; + + error: + virObjectListFreeCount(*vms, *nvms); + *vms = NULL; + *nvms = 0; + + return -1; +} + + +int +virDomainObjListExport(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr **domains, + virDomainObjListACLFilter filter, + unsigned int flags) +{ + virDomainObjPtr *vms = NULL; + virDomainPtr *doms = NULL; + size_t nvms = 0; + size_t i; + int ret = -1; + + if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0) + return -1; + + if (domains) { + if (VIR_ALLOC_N(doms, nvms + 1) < 0) + goto cleanup; + + for (i = 0; i < nvms; i++) { + virDomainObjPtr vm = vms[i]; + + virObjectLock(vm); + + if (!(doms[i] = virGetDomain(conn, vm->def->name, vm->def->uuid))) { + virObjectUnlock(vm); + goto cleanup; + } + + doms[i]->id = vm->def->id; + + virObjectUnlock(vm); + } + + *domains = doms; + doms = NULL; + } + + ret = nvms; + + cleanup: + virObjectListFree(doms); + virObjectListFreeCount(vms, nvms); + return ret; +} diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h new file mode 100644 index 0000000..bcff88a --- /dev/null +++ b/src/conf/virdomainobjlist.h @@ -0,0 +1,146 @@ +/* + * virdomainobjlist.h: domain objects list utilities + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#ifndef __VIRDOMAINOBJLIST_H__ +# define __VIRDOMAINOBJLIST_H__ + +# include "domain_conf.h" + +typedef struct _virDomainObjList virDomainObjList; +typedef virDomainObjList *virDomainObjListPtr; + +virDomainObjListPtr virDomainObjListNew(void); + +virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, + int id); +virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, + const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, + const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, + const char *name); + +enum { + VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1), +}; +virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, + virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt, + unsigned int flags, + virDomainDefPtr *oldDef); + +void virDomainObjListRemove(virDomainObjListPtr doms, + virDomainObjPtr dom); +void virDomainObjListRemoveLocked(virDomainObjListPtr doms, + virDomainObjPtr dom); + +int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, + const char *configDir, + const char *autostartDir, + int liveStatus, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + virDomainLoadConfigNotify notify, + void *opaque); + +int virDomainObjListNumOfDomains(virDomainObjListPtr doms, + bool active, + virDomainObjListACLFilter filter, + virConnectPtr conn); + +int virDomainObjListGetActiveIDs(virDomainObjListPtr doms, + int *ids, + int maxids, + virDomainObjListACLFilter filter, + virConnectPtr conn); +int virDomainObjListGetInactiveNames(virDomainObjListPtr doms, + char **const names, + int maxnames, + virDomainObjListACLFilter filter, + virConnectPtr conn); + +typedef int (*virDomainObjListIterator)(virDomainObjPtr dom, + void *opaque); + +int virDomainObjListForEach(virDomainObjListPtr doms, + virDomainObjListIterator callback, + void *opaque); + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ + (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ + VIR_CONNECT_LIST_DOMAINS_INACTIVE) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \ + (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \ + VIR_CONNECT_LIST_DOMAINS_TRANSIENT) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \ + (VIR_CONNECT_LIST_DOMAINS_RUNNING | \ + VIR_CONNECT_LIST_DOMAINS_PAUSED | \ + VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \ + VIR_CONNECT_LIST_DOMAINS_OTHER) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \ + (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \ + VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \ + (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \ + VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \ + (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \ + VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) + +# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \ + (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART | \ + VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT) + +int virDomainObjListCollect(virDomainObjListPtr doms, + virConnectPtr conn, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags); +int virDomainObjListExport(virDomainObjListPtr doms, + virConnectPtr conn, + virDomainPtr **domains, + virDomainObjListACLFilter filter, + unsigned int flags); +int virDomainObjListConvert(virDomainObjListPtr domlist, + virConnectPtr conn, + virDomainPtr *doms, + size_t ndoms, + virDomainObjPtr **vms, + size_t *nvms, + virDomainObjListACLFilter filter, + unsigned int flags, + bool skip_missing); + +#endif /* __VIRDOMAINOBJLIST_H__ */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c304ff3..3105563 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -24,7 +24,7 @@ #include <config.h> #include "internal.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "snapshot_conf.h" #include "virauth.h" #include "viralloc.h" diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index b539541..e3bd49f 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -24,7 +24,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "virauth.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eb7ec76..7f85721 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -391,22 +391,6 @@ virDomainObjGetMetadata; virDomainObjGetOneDef; virDomainObjGetPersistentDef; virDomainObjGetState; -virDomainObjListAdd; -virDomainObjListCollect; -virDomainObjListConvert; -virDomainObjListExport; -virDomainObjListFindByID; -virDomainObjListFindByName; -virDomainObjListFindByUUID; -virDomainObjListFindByUUIDRef; -virDomainObjListForEach; -virDomainObjListGetActiveIDs; -virDomainObjListGetInactiveNames; -virDomainObjListLoadAllConfigs; -virDomainObjListNew; -virDomainObjListNumOfDomains; -virDomainObjListRemove; -virDomainObjListRemoveLocked; virDomainObjNew; virDomainObjParseNode; virDomainObjSetDefTransient; @@ -876,6 +860,25 @@ virChrdevFree; virChrdevOpen; +# conf/virdomainobjlist.h +virDomainObjListAdd; +virDomainObjListCollect; +virDomainObjListConvert; +virDomainObjListExport; +virDomainObjListFindByID; +virDomainObjListFindByName; +virDomainObjListFindByUUID; +virDomainObjListFindByUUIDRef; +virDomainObjListForEach; +virDomainObjListGetActiveIDs; +virDomainObjListGetInactiveNames; +virDomainObjListLoadAllConfigs; +virDomainObjListNew; +virDomainObjListNumOfDomains; +virDomainObjListRemove; +virDomainObjListRemoveLocked; + + # cpu/cpu.h cpuBaseline; cpuBaselineXML; diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 9c29b1e..7c68b2b 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -30,7 +30,7 @@ # include "internal.h" # include "libvirt_internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "domain_event.h" # include "capabilities.h" # include "configmake.h" diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index a5c5806..fc36740 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -30,7 +30,7 @@ # define OPENVZ_CONF_H # include "internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "virthread.h" diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d38006f..ac3ff5b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -60,6 +60,7 @@ #include "cpu/cpu.h" #include "virauth.h" #include "viratomic.h" +#include "virdomainobjlist.h" #define VIR_FROM_THIS VIR_FROM_TEST diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 05e19ff..9a45d10 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -28,7 +28,7 @@ # include "libvirt_internal.h" # include "capabilities.h" # include "network_conf.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "domain_event.h" # include "virerror.h" # include "virthread.h" diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h index e6b8a9e..4df0a00 100644 --- a/src/util/virclosecallbacks.h +++ b/src/util/virclosecallbacks.h @@ -25,7 +25,7 @@ #ifndef __VIR_CLOSE_CALLBACKS__ # define __VIR_CLOSE_CALLBACKS__ -# include "domain_conf.h" +# include "virdomainobjlist.h" typedef struct _virCloseCallbacks virCloseCallbacks; typedef virCloseCallbacks *virCloseCallbacksPtr; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 91a61f8..7383f41 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -25,7 +25,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomainobjlist.h" #include "domain_event.h" #include "virlog.h" #include "viralloc.h" diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index 1f3c41a..b3f8cdf 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -26,7 +26,7 @@ # define NOGUI "nogui" # include "internal.h" -# include "domain_conf.h" +# include "virdomainobjlist.h" # include "virthread.h" # define VIR_FROM_THIS VIR_FROM_VMWARE diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index db09647..d35616a 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -26,7 +26,7 @@ # include <Parallels.h> # include "driver.h" -# include "conf/domain_conf.h" +# include "conf/virdomainobjlist.h" # include "conf/storage_conf.h" # include "conf/domain_event.h" # include "conf/network_conf.h" diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 1d4dc25..86092e5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -32,7 +32,7 @@ #include <libxml/xmlsave.h> #include "internal.h" -#include "conf/domain_conf.h" +#include "conf/virdomainobjlist.h" #include "intprops.h" #include "viralloc.h" #include "virmacaddr.h" -- 2.4.5

2 1

[libvirt] [PATCH v7] autocreate tap device for VIR_DOMAIN_NET_TYPE_ETHERNET
by Vasiliy Tolstov 28 Jul '15

28 Jul '15

If a user specify ehernet device create it via libvirt and run script if it provided. After this commit user does not need to run external script to create tap device or add root to qemu process. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 143 +++++++++++++++++++++++++++++++----------------- src/qemu/qemu_hotplug.c | 13 ++--- src/qemu/qemu_process.c | 6 ++ 3 files changed, 102 insertions(+), 60 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3886b4f..c4d1fde 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -332,10 +332,39 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + * + * This function executes script for new tap device created by libvirt. + * Returns 0 in case of success or -1 on failure + */ +static int +qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; +} + /* qemuNetworkIfaceConnect - *only* called if actualType is - * VIR_DOMAIN_NET_TYPE_NETWORK or VIR_DOMAIN_NET_TYPE_BRIDGE (i.e. if - * the connection is made with a tap device connecting to a bridge - * device) + * VIR_DOMAIN_NET_TYPE_NETWORK, VIR_DOMAIN_NET_TYPE_BRIDGE + * VIR_DOMAIN_NET_TYPE_ETHERNET (i.e. if the connection is + * made with a tap device connecting to a bridge device or + * use plain tap device) */ int qemuNetworkIfaceConnect(virDomainDefPtr def, @@ -351,6 +380,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, bool template_ifname = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *tunpath = "/dev/net/tun"; + virMacAddr tapmac; if (net->backend.tap) { tunpath = net->backend.tap; @@ -361,11 +391,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } } - if (!(brname = virDomainNetGetActualBridgeName(net))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); - goto cleanup; - } - if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { @@ -381,40 +406,66 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - if (virDomainNetGetActualBridgeMACTableManager(net) - == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { - /* libvirt is managing the FDB of the bridge this device - * is attaching to, so we need to turn off learning and - * unicast_flood on the device to prevent the kernel from - * adding any FDB entries for it. We will add add an fdb - * entry ourselves (during qemuInterfaceStartDevices(), - * using the MAC address from the interface config. - */ - if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) - goto cleanup; - if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + virMacAddrSet(&tapmac, &net->mac); + tapmac.addr[0] = 0xFE; + + if (virNetDevSetMAC(net->ifname, &tapmac) < 0) + goto cleanup; + + if (virNetDevSetOnline(net->ifname, true) < 0) + goto cleanup; + + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; } } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (!(brname = virDomainNetGetActualBridgeName(net))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); goto cleanup; } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; + + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + if (virDomainNetGetActualBridgeMACTableManager(net) + == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { + /* libvirt is managing the FDB of the bridge this device + * is attaching to, so we need to turn off learning and + * unicast_flood on the device to prevent the kernel from + * adding any FDB entries for it. We will add add an fdb + * entry ourselves (during qemuInterfaceStartDevices(), + * using the MAC address from the interface config. + */ + if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) + goto cleanup; + if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } } @@ -5221,6 +5272,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAsprintf(&buf, "tap%c", type_sep); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ @@ -5238,20 +5290,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, is_tap = true; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; - case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", type_sep, @@ -8226,7 +8264,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -8235,7 +8274,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (net->backend.tap && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Custom tap device path is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -8245,7 +8285,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, cfg = virQEMUDriverGetConfig(driver); if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cc86a3b..21ea3fd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -908,7 +908,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -916,7 +917,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -947,13 +949,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set device online immediately */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 64ee049..d866e44 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5205,6 +5205,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (net->ifname) { + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + } + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.3.3

2 3

[libvirt] [libvirt-test-API][PATCH 0/2] Add a new case for storagePoolLookupByVolume API
by jiahu 28 Jul '15

28 Jul '15

This API will be tested in dir/logicl/netfs pool type. jiahu (2): Add pool_lookup_by_volume.py to conf Add new case to test storagePoolLookupByVolume cases/storage_dir.conf | 6 +++++ cases/storage_logical.conf | 6 +++++ cases/storage_netfs.conf | 6 +++++ repos/storage/pool_lookup_by_volume.py | 46 ++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 repos/storage/pool_lookup_by_volume.py -- 1.8.1.4

2 3

[libvirt] [RFC] Design: Tunnelled NBD block disk migration
by Pavel Boldin 27 Jul '15

27 Jul '15

Dear All, I continue my work on the tunnelled selective block disks migration and the next step is to implement Tunnelled NBD block disk migration. As far as I see libvirt uses the following algorithm for tunnelling the QEMU migration stream that is unidirectional: 1. The qemuMigrationStartTunnel (src/qemu/qemu_migration.c) starts a thread that reads the data from the local QEMU pipe and writes it to the virStream using virStreamSend. 2. The stream used by virStreamSend is embedded in the remote protocol messaging by the remoteDomainMigratePrepareTunnel3{,Params} (src/remote/remote_driver.c). 3. Remote links the daemonStream with the virFDStream connected to the write end of a pipe linked with the QEMU. 4. Overall stream path is then: QEMU -(pipe)> virStreamSend -> (message passing to the remote) -> TCP -> (message received by deamon/*.c code) -> virStreamSend -> virFDStreamWrite -(pipe)> QEMU. Given that I wonder what should be the changes required to implement a bidirectional QEMU tunnelled connection for the NBD device disk migration. The way I see implementation details at the moment: 0. The `virStream` and corresponding `daemon/*.c` must be modified in a way that multiple streams can be multiplexed through the only one remote connection. 1. `Pipe`s used to interconnect to the QEMU on the both sides are obviously to be replaced by the UNIX sockets since the pipes cannot support bidirectional output due to the design. This is to be made *one for each* block device, requiring the above change. 2. The `qemuMigrationIOFunc` must be rewritten in such a way it polls for both read and write on the UNIX sockets *and* VM migration pipe and tunnells these to the appropriate `virStream`. 3. The receiving code must be modified in such a way to tunnel each of the opened UNIX socket to the according virFDStream. Of the mentioned above the most intriguing for me is the zero-th item which will require some changes to the binary remote messaging protocol. Is my vision on the problem is correct? Are there any other difficulties I'm going to face but not aware of due to the lack of the familiarity with the code? Pavel

2 3

[libvirt] [PATCH] docs: set more permissive patterns for paths in rng schemas
by Dmitry Guryanov 27 Jul '15

27 Jul '15

There is no obvious reason to limit paths, used in libvirt to a subset of what is allowed in linux. So let's allow any symbols in paths. --- docs/schemas/basictypes.rng | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index a83063a..12cab6a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -230,25 +230,25 @@ <define name="filePath"> <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + <param name="pattern">.+</param> </data> </define> <define name="dirPath"> <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + <param name="pattern">.+</param> </data> </define> <define name="absFilePath"> <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,:]+</param> + <param name="pattern">/.+</param> </data> </define> <define name="absDirPath"> <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> + <param name="pattern">/.*</param> </data> </define> -- 2.4.3

2 1

[libvirt] PING: [PATCH v5 0/4] qemu: Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 27 Jul '15

27 Jul '15

PING Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of Pavel Fedin > Sent: Friday, July 17, 2015 2:28 PM > To: libvir-list(a)redhat.com > Cc: Peter Krempa > Subject: [libvirt] [PATCH v5 0/4] qemu: Allow PCI virtio on ARM "virt" machine > > Virt machine in qemu since v2.3.0 has PCI generic host controller, and > can use PCI devices. This provides performance improvement as well as > vhost-net with irqfd support for virtio-net. However libvirt currently > does not allow ARM virt machine to have PCI devices. This patchset adds > the necessary support. > > Changes since v4: > - Rebased onto current master > - Added possibility to plug virtio-net-pci adapter directly into PCIe bus. > This is necessary for irqfds to work in qemu. > Changes since v3: > - Capability is based not on qemu version but on support of "gpex-pcihost" > device by qemu > - Added a workaround, allowing to pass "make check". The problem is that > test suite does not build capabilities cache. Unfortunately this means > that correct unit-test for the new functionality currently cannot be > written. Test suite framework needs to be improved. > Changes since v2: > Complete rework, use different approach > - Correctly model PCI Express bus on the machine. It is now possible to > explicitly specify <address-type='pci'> with attributes. This allows to > attach not only virtio, but any other PCI device to the model. > - Default is not changed and still mmio, for backwards compatibility with > existing installations. PCI bus has to be explicitly specified. > - Check for the capability in correct place, in v2 it actually did not > work > Changes since v1: > - Added capability based on qemu version number > - Recognize also "virt-" prefix > > Pavel Fedin (4): > qemu: Introduce QEMU_CAPS_OBJECT_GPEX > Add PCI-Express root to ARM virt machine > Build correct command line for PCI NICs on ARM > Allow to plug virtio-net-pci into PCIe slot > > src/qemu/qemu_capabilities.c | 10 ++++++++++ > src/qemu/qemu_capabilities.h | 1 + > src/qemu/qemu_command.c | 11 ++++++++++- > src/qemu/qemu_domain.c | 17 +++++++++++++---- > 4 files changed, 34 insertions(+), 5 deletions(-) > > -- > 1.9.5.msysgit.0 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCH] tests: Shorten nodeinfo test name
by Andrea Bolognani 27 Jul '15

27 Jul '15

The long name was causing make dist to fail, at least on certain operating systems. --- .../cpu/cpu99 => linux-nonpresent/cpu/cpu0}/online | 0 .../cpu/cpu98 => linux-nonpresent/cpu/cpu1}/online | 0 .../cpu/cpu97 => linux-nonpresent/cpu/cpu10}/online | 0 .../cpu/cpu96 => linux-nonpresent/cpu/cpu100}/online | 0 .../cpu/cpu95 => linux-nonpresent/cpu/cpu101}/online | 0 .../cpu/cpu94 => linux-nonpresent/cpu/cpu102}/online | 0 .../cpu/cpu93 => linux-nonpresent/cpu/cpu103}/online | 0 .../cpu/cpu72 => linux-nonpresent/cpu/cpu104}/online | 0 .../cpu/cpu104/topology/core_id | 0 .../cpu/cpu112 => linux-nonpresent/cpu/cpu104}/topology/core_siblings | 0 .../cpu112 => linux-nonpresent/cpu/cpu104}/topology/core_siblings_list | 0 .../cpu112 => linux-nonpresent/cpu/cpu104}/topology/physical_package_id | 0 .../cpu/cpu104/topology/thread_siblings | 0 .../cpu/cpu104/topology/thread_siblings_list | 0 .../cpu/cpu92 => linux-nonpresent/cpu/cpu105}/online | 0 .../cpu/cpu91 => linux-nonpresent/cpu/cpu106}/online | 0 .../cpu/cpu90 => linux-nonpresent/cpu/cpu107}/online | 0 .../cpu/cpu9 => linux-nonpresent/cpu/cpu108}/online | 0 .../cpu/cpu89 => linux-nonpresent/cpu/cpu109}/online | 0 .../cpu/cpu88 => linux-nonpresent/cpu/cpu11}/online | 0 .../cpu/cpu87 => linux-nonpresent/cpu/cpu110}/online | 0 .../cpu/cpu86 => linux-nonpresent/cpu/cpu111}/online | 0 .../cpu/cpu48 => linux-nonpresent/cpu/cpu112}/online | 0 .../cpu/cpu112/topology/core_id | 0 .../cpu/cpu104 => linux-nonpresent/cpu/cpu112}/topology/core_siblings | 0 .../cpu104 => linux-nonpresent/cpu/cpu112}/topology/core_siblings_list | 0 .../cpu104 => linux-nonpresent/cpu/cpu112}/topology/physical_package_id | 0 .../cpu/cpu112/topology/thread_siblings | 0 .../cpu/cpu112/topology/thread_siblings_list | 0 .../cpu/cpu85 => linux-nonpresent/cpu/cpu113}/online | 0 .../cpu/cpu84 => linux-nonpresent/cpu/cpu114}/online | 0 .../cpu/cpu83 => linux-nonpresent/cpu/cpu115}/online | 0 .../cpu/cpu82 => linux-nonpresent/cpu/cpu116}/online | 0 .../cpu/cpu81 => linux-nonpresent/cpu/cpu117}/online | 0 .../cpu/cpu80 => linux-nonpresent/cpu/cpu118}/online | 0 .../cpu/cpu8 => linux-nonpresent/cpu/cpu119}/online | 0 .../cpu/cpu79 => linux-nonpresent/cpu/cpu12}/online | 0 .../cpu/cpu40 => linux-nonpresent/cpu/cpu120}/online | 0 .../cpu/cpu120/topology/core_id | 0 .../cpu/cpu136 => linux-nonpresent/cpu/cpu120}/topology/core_siblings | 0 .../cpu136 => linux-nonpresent/cpu/cpu120}/topology/core_siblings_list | 0 .../cpu136 => linux-nonpresent/cpu/cpu120}/topology/physical_package_id | 0 .../cpu/cpu120/topology/thread_siblings | 0 .../cpu/cpu120/topology/thread_siblings_list | 0 .../cpu/cpu78 => linux-nonpresent/cpu/cpu121}/online | 0 .../cpu/cpu77 => linux-nonpresent/cpu/cpu122}/online | 0 .../cpu/cpu76 => linux-nonpresent/cpu/cpu123}/online | 0 .../cpu/cpu75 => linux-nonpresent/cpu/cpu124}/online | 0 .../cpu/cpu74 => linux-nonpresent/cpu/cpu125}/online | 0 .../cpu/cpu73 => linux-nonpresent/cpu/cpu126}/online | 0 .../cpu/cpu71 => linux-nonpresent/cpu/cpu127}/online | 0 .../cpu/cpu24 => linux-nonpresent/cpu/cpu128}/online | 0 .../cpu/cpu128/topology/core_id | 0 .../cpu/cpu128/topology/core_siblings | 0 .../cpu/cpu128/topology/core_siblings_list | 0 .../cpu/cpu128/topology/physical_package_id | 0 .../cpu/cpu128/topology/thread_siblings | 0 .../cpu/cpu128/topology/thread_siblings_list | 0 .../cpu/cpu70 => linux-nonpresent/cpu/cpu129}/online | 0 .../cpu/cpu7 => linux-nonpresent/cpu/cpu13}/online | 0 .../cpu/cpu69 => linux-nonpresent/cpu/cpu130}/online | 0 .../cpu/cpu68 => linux-nonpresent/cpu/cpu131}/online | 0 .../cpu/cpu67 => linux-nonpresent/cpu/cpu132}/online | 0 .../cpu/cpu66 => linux-nonpresent/cpu/cpu133}/online | 0 .../cpu/cpu65 => linux-nonpresent/cpu/cpu134}/online | 0 .../cpu/cpu64 => linux-nonpresent/cpu/cpu135}/online | 0 .../cpu/cpu16 => linux-nonpresent/cpu/cpu136}/online | 0 .../cpu/cpu136/topology/core_id | 0 .../cpu/cpu120 => linux-nonpresent/cpu/cpu136}/topology/core_siblings | 0 .../cpu120 => linux-nonpresent/cpu/cpu136}/topology/core_siblings_list | 0 .../cpu120 => linux-nonpresent/cpu/cpu136}/topology/physical_package_id | 0 .../cpu/cpu136/topology/thread_siblings | 0 .../cpu/cpu136/topology/thread_siblings_list | 0 .../cpu/cpu63 => linux-nonpresent/cpu/cpu137}/online | 0 .../cpu/cpu62 => linux-nonpresent/cpu/cpu138}/online | 0 .../cpu/cpu61 => linux-nonpresent/cpu/cpu139}/online | 0 .../cpu/cpu60 => linux-nonpresent/cpu/cpu14}/online | 0 .../cpu/cpu6 => linux-nonpresent/cpu/cpu140}/online | 0 .../cpu/cpu59 => linux-nonpresent/cpu/cpu141}/online | 0 .../cpu/cpu58 => linux-nonpresent/cpu/cpu142}/online | 0 .../cpu/cpu57 => linux-nonpresent/cpu/cpu143}/online | 0 .../cpu/cpu56 => linux-nonpresent/cpu/cpu144}/online | 0 .../cpu/cpu55 => linux-nonpresent/cpu/cpu145}/online | 0 .../cpu/cpu54 => linux-nonpresent/cpu/cpu146}/online | 0 .../cpu/cpu53 => linux-nonpresent/cpu/cpu147}/online | 0 .../cpu/cpu52 => linux-nonpresent/cpu/cpu148}/online | 0 .../cpu/cpu51 => linux-nonpresent/cpu/cpu149}/online | 0 .../cpu/cpu50 => linux-nonpresent/cpu/cpu15}/online | 0 .../cpu/cpu5 => linux-nonpresent/cpu/cpu150}/online | 0 .../cpu/cpu49 => linux-nonpresent/cpu/cpu151}/online | 0 .../cpu/cpu47 => linux-nonpresent/cpu/cpu152}/online | 0 .../cpu/cpu46 => linux-nonpresent/cpu/cpu153}/online | 0 .../cpu/cpu45 => linux-nonpresent/cpu/cpu154}/online | 0 .../cpu/cpu44 => linux-nonpresent/cpu/cpu155}/online | 0 .../cpu/cpu43 => linux-nonpresent/cpu/cpu156}/online | 0 .../cpu/cpu42 => linux-nonpresent/cpu/cpu157}/online | 0 .../cpu/cpu41 => linux-nonpresent/cpu/cpu158}/online | 0 .../cpu/cpu4 => linux-nonpresent/cpu/cpu159}/online | 0 .../cpu/cpu136 => linux-nonpresent/cpu/cpu16}/online | 0 .../cpu/cpu16/topology/core_id | 0 .../cpu/cpu24 => linux-nonpresent/cpu/cpu16}/topology/core_siblings | 0 .../cpu24 => linux-nonpresent/cpu/cpu16}/topology/core_siblings_list | 0 .../cpu24 => linux-nonpresent/cpu/cpu16}/topology/physical_package_id | 0 .../cpu/cpu16/topology/thread_siblings | 0 .../cpu/cpu16/topology/thread_siblings_list | 0 .../cpu/cpu39 => linux-nonpresent/cpu/cpu17}/online | 0 .../cpu/cpu38 => linux-nonpresent/cpu/cpu18}/online | 0 .../cpu/cpu37 => linux-nonpresent/cpu/cpu19}/online | 0 .../cpu/cpu36 => linux-nonpresent/cpu/cpu2}/online | 0 .../cpu/cpu35 => linux-nonpresent/cpu/cpu20}/online | 0 .../cpu/cpu34 => linux-nonpresent/cpu/cpu21}/online | 0 .../cpu/cpu33 => linux-nonpresent/cpu/cpu22}/online | 0 .../cpu/cpu32 => linux-nonpresent/cpu/cpu23}/online | 0 .../cpu/cpu128 => linux-nonpresent/cpu/cpu24}/online | 0 .../cpu/cpu24/topology/core_id | 0 .../cpu/cpu16 => linux-nonpresent/cpu/cpu24}/topology/core_siblings | 0 .../cpu16 => linux-nonpresent/cpu/cpu24}/topology/core_siblings_list | 0 .../cpu16 => linux-nonpresent/cpu/cpu24}/topology/physical_package_id | 0 .../cpu/cpu24/topology/thread_siblings | 0 .../cpu/cpu24/topology/thread_siblings_list | 0 .../cpu/cpu31 => linux-nonpresent/cpu/cpu25}/online | 0 .../cpu/cpu30 => linux-nonpresent/cpu/cpu26}/online | 0 .../cpu/cpu3 => linux-nonpresent/cpu/cpu27}/online | 0 .../cpu/cpu29 => linux-nonpresent/cpu/cpu28}/online | 0 .../cpu/cpu28 => linux-nonpresent/cpu/cpu29}/online | 0 .../cpu/cpu27 => linux-nonpresent/cpu/cpu3}/online | 0 .../cpu/cpu26 => linux-nonpresent/cpu/cpu30}/online | 0 .../cpu/cpu25 => linux-nonpresent/cpu/cpu31}/online | 0 .../cpu/cpu23 => linux-nonpresent/cpu/cpu32}/online | 0 .../cpu/cpu22 => linux-nonpresent/cpu/cpu33}/online | 0 .../cpu/cpu21 => linux-nonpresent/cpu/cpu34}/online | 0 .../cpu/cpu20 => linux-nonpresent/cpu/cpu35}/online | 0 .../cpu/cpu2 => linux-nonpresent/cpu/cpu36}/online | 0 .../cpu/cpu19 => linux-nonpresent/cpu/cpu37}/online | 0 .../cpu/cpu18 => linux-nonpresent/cpu/cpu38}/online | 0 .../cpu/cpu17 => linux-nonpresent/cpu/cpu39}/online | 0 .../cpu/cpu159 => linux-nonpresent/cpu/cpu4}/online | 0 .../cpu/cpu120 => linux-nonpresent/cpu/cpu40}/online | 0 .../cpu/cpu40/topology/core_id | 0 .../cpu/cpu72 => linux-nonpresent/cpu/cpu40}/topology/core_siblings | 0 .../cpu72 => linux-nonpresent/cpu/cpu40}/topology/core_siblings_list | 0 .../cpu72 => linux-nonpresent/cpu/cpu40}/topology/physical_package_id | 0 .../cpu/cpu40/topology/thread_siblings | 0 .../cpu/cpu40/topology/thread_siblings_list | 0 .../cpu/cpu158 => linux-nonpresent/cpu/cpu41}/online | 0 .../cpu/cpu157 => linux-nonpresent/cpu/cpu42}/online | 0 .../cpu/cpu156 => linux-nonpresent/cpu/cpu43}/online | 0 .../cpu/cpu155 => linux-nonpresent/cpu/cpu44}/online | 0 .../cpu/cpu154 => linux-nonpresent/cpu/cpu45}/online | 0 .../cpu/cpu153 => linux-nonpresent/cpu/cpu46}/online | 0 .../cpu/cpu152 => linux-nonpresent/cpu/cpu47}/online | 0 .../cpu/cpu112 => linux-nonpresent/cpu/cpu48}/online | 0 .../cpu/cpu48/topology/core_id | 0 .../cpu/cpu48/topology/core_siblings | 0 .../cpu/cpu48/topology/core_siblings_list | 0 .../cpu/cpu48/topology/physical_package_id | 0 .../cpu/cpu48/topology/thread_siblings | 0 .../cpu/cpu48/topology/thread_siblings_list | 0 .../cpu/cpu151 => linux-nonpresent/cpu/cpu49}/online | 0 .../cpu/cpu150 => linux-nonpresent/cpu/cpu5}/online | 0 .../cpu/cpu15 => linux-nonpresent/cpu/cpu50}/online | 0 .../cpu/cpu149 => linux-nonpresent/cpu/cpu51}/online | 0 .../cpu/cpu148 => linux-nonpresent/cpu/cpu52}/online | 0 .../cpu/cpu147 => linux-nonpresent/cpu/cpu53}/online | 0 .../cpu/cpu146 => linux-nonpresent/cpu/cpu54}/online | 0 .../cpu/cpu145 => linux-nonpresent/cpu/cpu55}/online | 0 .../cpu/cpu144 => linux-nonpresent/cpu/cpu56}/online | 0 .../cpu/cpu143 => linux-nonpresent/cpu/cpu57}/online | 0 .../cpu/cpu142 => linux-nonpresent/cpu/cpu58}/online | 0 .../cpu/cpu141 => linux-nonpresent/cpu/cpu59}/online | 0 .../cpu/cpu140 => linux-nonpresent/cpu/cpu6}/online | 0 .../cpu/cpu14 => linux-nonpresent/cpu/cpu60}/online | 0 .../cpu/cpu139 => linux-nonpresent/cpu/cpu61}/online | 0 .../cpu/cpu138 => linux-nonpresent/cpu/cpu62}/online | 0 .../cpu/cpu137 => linux-nonpresent/cpu/cpu63}/online | 0 .../cpu/cpu135 => linux-nonpresent/cpu/cpu64}/online | 0 .../cpu/cpu134 => linux-nonpresent/cpu/cpu65}/online | 0 .../cpu/cpu133 => linux-nonpresent/cpu/cpu66}/online | 0 .../cpu/cpu132 => linux-nonpresent/cpu/cpu67}/online | 0 .../cpu/cpu131 => linux-nonpresent/cpu/cpu68}/online | 0 .../cpu/cpu130 => linux-nonpresent/cpu/cpu69}/online | 0 .../cpu/cpu13 => linux-nonpresent/cpu/cpu7}/online | 0 .../cpu/cpu129 => linux-nonpresent/cpu/cpu70}/online | 0 .../cpu/cpu127 => linux-nonpresent/cpu/cpu71}/online | 0 .../cpu/cpu104 => linux-nonpresent/cpu/cpu72}/online | 0 .../cpu/cpu72/topology/core_id | 0 .../cpu/cpu40 => linux-nonpresent/cpu/cpu72}/topology/core_siblings | 0 .../cpu40 => linux-nonpresent/cpu/cpu72}/topology/core_siblings_list | 0 .../cpu40 => linux-nonpresent/cpu/cpu72}/topology/physical_package_id | 0 .../cpu/cpu72/topology/thread_siblings | 0 .../cpu/cpu72/topology/thread_siblings_list | 0 .../cpu/cpu126 => linux-nonpresent/cpu/cpu73}/online | 0 .../cpu/cpu125 => linux-nonpresent/cpu/cpu74}/online | 0 .../cpu/cpu124 => linux-nonpresent/cpu/cpu75}/online | 0 .../cpu/cpu123 => linux-nonpresent/cpu/cpu76}/online | 0 .../cpu/cpu122 => linux-nonpresent/cpu/cpu77}/online | 0 .../cpu/cpu121 => linux-nonpresent/cpu/cpu78}/online | 0 .../cpu/cpu12 => linux-nonpresent/cpu/cpu79}/online | 0 .../cpu/cpu119 => linux-nonpresent/cpu/cpu8}/online | 0 .../cpu/cpu118 => linux-nonpresent/cpu/cpu80}/online | 0 .../cpu/cpu117 => linux-nonpresent/cpu/cpu81}/online | 0 .../cpu/cpu116 => linux-nonpresent/cpu/cpu82}/online | 0 .../cpu/cpu115 => linux-nonpresent/cpu/cpu83}/online | 0 .../cpu/cpu114 => linux-nonpresent/cpu/cpu84}/online | 0 .../cpu/cpu113 => linux-nonpresent/cpu/cpu85}/online | 0 .../cpu/cpu111 => linux-nonpresent/cpu/cpu86}/online | 0 .../cpu/cpu110 => linux-nonpresent/cpu/cpu87}/online | 0 .../cpu/cpu11 => linux-nonpresent/cpu/cpu88}/online | 0 .../cpu/cpu109 => linux-nonpresent/cpu/cpu89}/online | 0 .../cpu/cpu108 => linux-nonpresent/cpu/cpu9}/online | 0 .../cpu/cpu107 => linux-nonpresent/cpu/cpu90}/online | 0 .../cpu/cpu106 => linux-nonpresent/cpu/cpu91}/online | 0 .../cpu/cpu105 => linux-nonpresent/cpu/cpu92}/online | 0 .../cpu/cpu103 => linux-nonpresent/cpu/cpu93}/online | 0 .../cpu/cpu102 => linux-nonpresent/cpu/cpu94}/online | 0 .../cpu/cpu101 => linux-nonpresent/cpu/cpu95}/online | 0 .../cpu/cpu100 => linux-nonpresent/cpu/cpu96}/online | 0 .../cpu/cpu10 => linux-nonpresent/cpu/cpu97}/online | 0 .../cpu/cpu1 => linux-nonpresent/cpu/cpu98}/online | 0 .../cpu/cpu0 => linux-nonpresent/cpu/cpu99}/online | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/cpu/kernel_max | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/cpu/offline | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/cpu/online | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/cpu/possible | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/cpu/present | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu0 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu1 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu10 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu100 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu101 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu102 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu103 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu11 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu12 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu13 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu14 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu144 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu145 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu146 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu147 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu148 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu149 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu15 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu150 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu151 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu152 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu153 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu154 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu155 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu156 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu157 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu158 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu159 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu16 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu17 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu18 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu19 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu2 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu20 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu21 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu22 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu23 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu24 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu25 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu26 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu27 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu28 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu29 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu3 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu30 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu31 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu32 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu33 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu34 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu35 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu36 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu37 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu38 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu39 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu4 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu5 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu56 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu57 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu58 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu59 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu6 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu60 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu61 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu62 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu63 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu64 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu65 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu66 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu67 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu68 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu69 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu7 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu70 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu71 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu8 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu80 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu81 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu82 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu83 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu84 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu85 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu86 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu87 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu88 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu89 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu9 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu90 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu91 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu92 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu93 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu94 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu95 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu96 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu97 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu98 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu99 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node0/meminfo | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu40 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu41 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu42 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu43 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu44 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu45 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu46 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu47 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu48 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu49 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu50 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu51 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu52 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu53 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu54 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu55 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu72 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu73 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu74 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu75 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu76 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu77 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu78 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu79 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node1/meminfo | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu104 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu105 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu106 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu107 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu108 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu109 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu110 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu111 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu112 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu113 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu114 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu115 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu116 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu117 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu118 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu119 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node16/meminfo | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu120 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu121 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu122 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu123 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu124 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu125 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu126 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu127 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu128 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu129 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu130 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu131 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu132 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu133 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu134 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu135 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu136 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu137 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu138 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu139 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu140 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu141 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu142 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu143 | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/node17/meminfo | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/online | 0 .../{linux-deconfigured-cpus => linux-nonpresent}/node/possible | 0 ...x-ppc64-deconfigured-cpus.cpuinfo => linux-ppc64-nonpresent.cpuinfo} | 0 ...ppc64-deconfigured-cpus.expected => linux-ppc64-nonpresent.expected} | 0 tests/nodeinfotest.c | 2 +- 394 files changed, 1 insertion(+), 1 deletion(-) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu99 => linux-nonpresent/cpu/cpu0}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu98 => linux-nonpresent/cpu/cpu1}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu97 => linux-nonpresent/cpu/cpu10}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu96 => linux-nonpresent/cpu/cpu100}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu95 => linux-nonpresent/cpu/cpu101}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu94 => linux-nonpresent/cpu/cpu102}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu93 => linux-nonpresent/cpu/cpu103}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu72 => linux-nonpresent/cpu/cpu104}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu104/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu112 => linux-nonpresent/cpu/cpu104}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu112 => linux-nonpresent/cpu/cpu104}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu112 => linux-nonpresent/cpu/cpu104}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu104/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu104/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu92 => linux-nonpresent/cpu/cpu105}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu91 => linux-nonpresent/cpu/cpu106}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu90 => linux-nonpresent/cpu/cpu107}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu9 => linux-nonpresent/cpu/cpu108}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu89 => linux-nonpresent/cpu/cpu109}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu88 => linux-nonpresent/cpu/cpu11}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu87 => linux-nonpresent/cpu/cpu110}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu86 => linux-nonpresent/cpu/cpu111}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu48 => linux-nonpresent/cpu/cpu112}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu112/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu104 => linux-nonpresent/cpu/cpu112}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu104 => linux-nonpresent/cpu/cpu112}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu104 => linux-nonpresent/cpu/cpu112}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu112/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu112/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu85 => linux-nonpresent/cpu/cpu113}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu84 => linux-nonpresent/cpu/cpu114}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu83 => linux-nonpresent/cpu/cpu115}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu82 => linux-nonpresent/cpu/cpu116}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu81 => linux-nonpresent/cpu/cpu117}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu80 => linux-nonpresent/cpu/cpu118}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu8 => linux-nonpresent/cpu/cpu119}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu79 => linux-nonpresent/cpu/cpu12}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu40 => linux-nonpresent/cpu/cpu120}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu120/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu136 => linux-nonpresent/cpu/cpu120}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu136 => linux-nonpresent/cpu/cpu120}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu136 => linux-nonpresent/cpu/cpu120}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu120/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu120/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu78 => linux-nonpresent/cpu/cpu121}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu77 => linux-nonpresent/cpu/cpu122}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu76 => linux-nonpresent/cpu/cpu123}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu75 => linux-nonpresent/cpu/cpu124}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu74 => linux-nonpresent/cpu/cpu125}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu73 => linux-nonpresent/cpu/cpu126}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu71 => linux-nonpresent/cpu/cpu127}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu24 => linux-nonpresent/cpu/cpu128}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu128/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu70 => linux-nonpresent/cpu/cpu129}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu7 => linux-nonpresent/cpu/cpu13}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu69 => linux-nonpresent/cpu/cpu130}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu68 => linux-nonpresent/cpu/cpu131}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu67 => linux-nonpresent/cpu/cpu132}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu66 => linux-nonpresent/cpu/cpu133}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu65 => linux-nonpresent/cpu/cpu134}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu64 => linux-nonpresent/cpu/cpu135}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu16 => linux-nonpresent/cpu/cpu136}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu136/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu120 => linux-nonpresent/cpu/cpu136}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu120 => linux-nonpresent/cpu/cpu136}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu120 => linux-nonpresent/cpu/cpu136}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu136/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu136/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu63 => linux-nonpresent/cpu/cpu137}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu62 => linux-nonpresent/cpu/cpu138}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu61 => linux-nonpresent/cpu/cpu139}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu60 => linux-nonpresent/cpu/cpu14}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu6 => linux-nonpresent/cpu/cpu140}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu59 => linux-nonpresent/cpu/cpu141}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu58 => linux-nonpresent/cpu/cpu142}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu57 => linux-nonpresent/cpu/cpu143}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu56 => linux-nonpresent/cpu/cpu144}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu55 => linux-nonpresent/cpu/cpu145}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu54 => linux-nonpresent/cpu/cpu146}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu53 => linux-nonpresent/cpu/cpu147}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu52 => linux-nonpresent/cpu/cpu148}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu51 => linux-nonpresent/cpu/cpu149}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu50 => linux-nonpresent/cpu/cpu15}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu5 => linux-nonpresent/cpu/cpu150}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu49 => linux-nonpresent/cpu/cpu151}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu47 => linux-nonpresent/cpu/cpu152}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu46 => linux-nonpresent/cpu/cpu153}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu45 => linux-nonpresent/cpu/cpu154}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu44 => linux-nonpresent/cpu/cpu155}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu43 => linux-nonpresent/cpu/cpu156}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu42 => linux-nonpresent/cpu/cpu157}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu41 => linux-nonpresent/cpu/cpu158}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu4 => linux-nonpresent/cpu/cpu159}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu136 => linux-nonpresent/cpu/cpu16}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu16/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu24 => linux-nonpresent/cpu/cpu16}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu24 => linux-nonpresent/cpu/cpu16}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu24 => linux-nonpresent/cpu/cpu16}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu16/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu16/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu39 => linux-nonpresent/cpu/cpu17}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu38 => linux-nonpresent/cpu/cpu18}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu37 => linux-nonpresent/cpu/cpu19}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu36 => linux-nonpresent/cpu/cpu2}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu35 => linux-nonpresent/cpu/cpu20}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu34 => linux-nonpresent/cpu/cpu21}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu33 => linux-nonpresent/cpu/cpu22}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu32 => linux-nonpresent/cpu/cpu23}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu128 => linux-nonpresent/cpu/cpu24}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu24/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu16 => linux-nonpresent/cpu/cpu24}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu16 => linux-nonpresent/cpu/cpu24}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu16 => linux-nonpresent/cpu/cpu24}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu24/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu24/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu31 => linux-nonpresent/cpu/cpu25}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu30 => linux-nonpresent/cpu/cpu26}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu3 => linux-nonpresent/cpu/cpu27}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu29 => linux-nonpresent/cpu/cpu28}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu28 => linux-nonpresent/cpu/cpu29}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu27 => linux-nonpresent/cpu/cpu3}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu26 => linux-nonpresent/cpu/cpu30}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu25 => linux-nonpresent/cpu/cpu31}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu23 => linux-nonpresent/cpu/cpu32}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu22 => linux-nonpresent/cpu/cpu33}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu21 => linux-nonpresent/cpu/cpu34}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu20 => linux-nonpresent/cpu/cpu35}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu2 => linux-nonpresent/cpu/cpu36}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu19 => linux-nonpresent/cpu/cpu37}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu18 => linux-nonpresent/cpu/cpu38}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu17 => linux-nonpresent/cpu/cpu39}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu159 => linux-nonpresent/cpu/cpu4}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu120 => linux-nonpresent/cpu/cpu40}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu40/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu72 => linux-nonpresent/cpu/cpu40}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu72 => linux-nonpresent/cpu/cpu40}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu72 => linux-nonpresent/cpu/cpu40}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu40/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu40/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu158 => linux-nonpresent/cpu/cpu41}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu157 => linux-nonpresent/cpu/cpu42}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu156 => linux-nonpresent/cpu/cpu43}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu155 => linux-nonpresent/cpu/cpu44}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu154 => linux-nonpresent/cpu/cpu45}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu153 => linux-nonpresent/cpu/cpu46}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu152 => linux-nonpresent/cpu/cpu47}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu112 => linux-nonpresent/cpu/cpu48}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu48/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu151 => linux-nonpresent/cpu/cpu49}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu150 => linux-nonpresent/cpu/cpu5}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu15 => linux-nonpresent/cpu/cpu50}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu149 => linux-nonpresent/cpu/cpu51}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu148 => linux-nonpresent/cpu/cpu52}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu147 => linux-nonpresent/cpu/cpu53}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu146 => linux-nonpresent/cpu/cpu54}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu145 => linux-nonpresent/cpu/cpu55}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu144 => linux-nonpresent/cpu/cpu56}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu143 => linux-nonpresent/cpu/cpu57}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu142 => linux-nonpresent/cpu/cpu58}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu141 => linux-nonpresent/cpu/cpu59}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu140 => linux-nonpresent/cpu/cpu6}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu14 => linux-nonpresent/cpu/cpu60}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu139 => linux-nonpresent/cpu/cpu61}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu138 => linux-nonpresent/cpu/cpu62}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu137 => linux-nonpresent/cpu/cpu63}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu135 => linux-nonpresent/cpu/cpu64}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu134 => linux-nonpresent/cpu/cpu65}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu133 => linux-nonpresent/cpu/cpu66}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu132 => linux-nonpresent/cpu/cpu67}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu131 => linux-nonpresent/cpu/cpu68}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu130 => linux-nonpresent/cpu/cpu69}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu13 => linux-nonpresent/cpu/cpu7}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu129 => linux-nonpresent/cpu/cpu70}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu127 => linux-nonpresent/cpu/cpu71}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu104 => linux-nonpresent/cpu/cpu72}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu72/topology/core_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu40 => linux-nonpresent/cpu/cpu72}/topology/core_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu40 => linux-nonpresent/cpu/cpu72}/topology/core_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu40 => linux-nonpresent/cpu/cpu72}/topology/physical_package_id (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu72/topology/thread_siblings (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/cpu72/topology/thread_siblings_list (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu126 => linux-nonpresent/cpu/cpu73}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu125 => linux-nonpresent/cpu/cpu74}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu124 => linux-nonpresent/cpu/cpu75}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu123 => linux-nonpresent/cpu/cpu76}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu122 => linux-nonpresent/cpu/cpu77}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu121 => linux-nonpresent/cpu/cpu78}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu12 => linux-nonpresent/cpu/cpu79}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu119 => linux-nonpresent/cpu/cpu8}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu118 => linux-nonpresent/cpu/cpu80}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu117 => linux-nonpresent/cpu/cpu81}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu116 => linux-nonpresent/cpu/cpu82}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu115 => linux-nonpresent/cpu/cpu83}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu114 => linux-nonpresent/cpu/cpu84}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu113 => linux-nonpresent/cpu/cpu85}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu111 => linux-nonpresent/cpu/cpu86}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu110 => linux-nonpresent/cpu/cpu87}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu11 => linux-nonpresent/cpu/cpu88}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu109 => linux-nonpresent/cpu/cpu89}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu108 => linux-nonpresent/cpu/cpu9}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu107 => linux-nonpresent/cpu/cpu90}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu106 => linux-nonpresent/cpu/cpu91}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu105 => linux-nonpresent/cpu/cpu92}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu103 => linux-nonpresent/cpu/cpu93}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu102 => linux-nonpresent/cpu/cpu94}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu101 => linux-nonpresent/cpu/cpu95}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu100 => linux-nonpresent/cpu/cpu96}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu10 => linux-nonpresent/cpu/cpu97}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu1 => linux-nonpresent/cpu/cpu98}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus/cpu/cpu0 => linux-nonpresent/cpu/cpu99}/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/kernel_max (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/offline (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/possible (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/cpu/present (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu0 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu1 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu10 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu100 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu101 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu102 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu103 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu11 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu12 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu13 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu14 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu144 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu145 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu146 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu147 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu148 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu149 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu15 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu150 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu151 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu152 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu153 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu154 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu155 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu156 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu157 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu158 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu159 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu16 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu17 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu18 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu19 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu2 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu20 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu21 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu22 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu23 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu24 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu25 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu26 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu27 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu28 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu29 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu3 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu30 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu31 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu32 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu33 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu34 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu35 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu36 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu37 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu38 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu39 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu4 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu5 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu56 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu57 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu58 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu59 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu6 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu60 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu61 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu62 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu63 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu64 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu65 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu66 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu67 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu68 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu69 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu7 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu70 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu71 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu8 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu80 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu81 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu82 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu83 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu84 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu85 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu86 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu87 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu88 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu89 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu9 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu90 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu91 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu92 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu93 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu94 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu95 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu96 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu97 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu98 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/cpu99 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node0/meminfo (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu40 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu41 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu42 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu43 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu44 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu45 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu46 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu47 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu48 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu49 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu50 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu51 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu52 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu53 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu54 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu55 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu72 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu73 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu74 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu75 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu76 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu77 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu78 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/cpu79 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node1/meminfo (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu104 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu105 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu106 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu107 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu108 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu109 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu110 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu111 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu112 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu113 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu114 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu115 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu116 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu117 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu118 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/cpu119 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node16/meminfo (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu120 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu121 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu122 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu123 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu124 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu125 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu126 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu127 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu128 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu129 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu130 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu131 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu132 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu133 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu134 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu135 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu136 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu137 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu138 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu139 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu140 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu141 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu142 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/cpu143 (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/node17/meminfo (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/online (100%) rename tests/nodeinfodata/{linux-deconfigured-cpus => linux-nonpresent}/node/possible (100%) rename tests/nodeinfodata/{linux-ppc64-deconfigured-cpus.cpuinfo => linux-ppc64-nonpresent.cpuinfo} (100%) rename tests/nodeinfodata/{linux-ppc64-deconfigured-cpus.expected => linux-ppc64-nonpresent.expected} (100%) diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu99/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu0/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu99/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu0/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu98/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu1/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu98/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu1/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu97/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu10/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu97/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu10/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu96/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu100/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu96/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu100/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu95/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu101/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu95/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu101/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu94/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu102/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu94/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu102/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu93/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu103/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu93/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu103/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu104/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu92/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu105/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu92/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu105/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu91/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu106/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu91/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu106/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu90/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu107/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu90/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu107/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu9/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu108/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu9/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu108/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu89/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu109/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu89/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu109/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu88/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu11/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu88/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu11/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu87/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu110/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu87/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu110/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu86/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu111/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu86/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu111/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu112/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu85/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu113/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu85/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu113/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu84/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu114/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu84/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu114/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu83/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu115/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu83/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu115/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu82/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu116/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu82/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu116/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu81/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu117/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu81/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu117/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu80/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu118/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu80/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu118/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu8/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu119/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu8/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu119/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu79/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu12/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu79/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu12/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu120/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu78/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu121/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu78/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu121/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu77/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu122/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu77/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu122/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu76/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu123/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu76/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu123/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu75/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu124/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu75/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu124/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu74/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu125/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu74/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu125/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu73/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu126/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu73/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu126/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu71/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu127/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu71/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu127/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu128/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu70/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu129/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu70/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu129/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu7/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu13/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu7/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu13/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu69/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu130/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu69/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu130/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu68/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu131/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu68/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu131/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu67/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu132/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu67/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu132/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu66/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu133/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu66/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu133/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu65/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu134/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu65/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu134/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu64/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu135/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu64/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu135/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu136/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu63/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu137/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu63/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu137/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu62/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu138/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu62/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu138/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu61/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu139/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu61/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu139/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu60/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu14/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu60/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu14/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu6/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu140/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu6/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu140/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu59/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu141/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu59/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu141/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu58/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu142/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu58/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu142/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu57/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu143/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu57/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu143/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu56/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu144/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu56/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu144/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu55/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu145/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu55/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu145/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu54/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu146/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu54/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu146/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu53/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu147/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu53/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu147/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu52/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu148/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu52/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu148/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu51/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu149/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu51/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu149/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu50/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu15/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu50/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu15/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu5/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu150/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu5/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu150/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu49/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu151/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu49/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu151/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu47/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu152/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu47/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu152/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu46/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu153/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu46/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu153/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu45/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu154/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu45/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu154/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu44/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu155/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu44/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu155/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu43/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu156/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu43/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu156/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu42/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu157/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu42/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu157/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu41/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu158/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu41/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu158/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu4/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu159/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu4/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu159/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu16/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu39/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu17/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu39/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu17/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu38/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu18/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu38/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu18/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu37/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu19/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu37/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu19/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu36/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu2/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu36/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu2/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu35/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu20/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu35/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu20/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu34/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu21/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu34/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu21/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu33/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu22/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu33/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu22/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu32/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu23/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu32/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu23/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu24/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu31/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu25/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu31/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu25/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu30/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu26/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu30/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu26/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu3/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu27/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu3/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu27/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu29/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu28/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu29/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu28/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu28/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu29/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu28/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu29/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu27/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu3/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu27/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu3/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu26/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu30/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu26/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu30/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu25/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu31/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu25/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu31/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu23/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu32/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu23/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu32/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu22/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu33/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu22/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu33/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu21/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu34/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu21/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu34/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu20/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu35/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu20/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu35/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu2/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu36/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu2/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu36/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu19/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu37/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu19/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu37/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu18/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu38/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu18/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu38/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu17/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu39/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu17/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu39/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu159/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu4/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu159/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu4/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu40/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu158/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu41/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu158/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu41/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu157/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu42/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu157/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu42/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu156/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu43/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu156/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu43/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu155/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu44/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu155/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu44/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu154/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu45/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu154/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu45/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu153/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu46/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu153/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu46/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu152/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu47/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu152/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu47/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu48/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu151/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu49/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu151/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu49/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu150/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu5/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu150/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu5/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu15/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu50/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu15/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu50/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu149/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu51/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu149/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu51/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu148/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu52/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu148/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu52/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu147/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu53/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu147/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu53/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu146/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu54/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu146/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu54/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu145/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu55/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu145/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu55/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu144/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu56/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu144/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu56/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu143/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu57/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu143/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu57/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu142/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu58/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu142/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu58/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu141/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu59/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu141/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu59/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu140/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu6/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu140/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu6/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu14/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu60/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu14/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu60/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu139/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu61/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu139/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu61/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu138/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu62/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu138/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu62/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu137/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu63/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu137/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu63/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu135/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu64/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu135/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu64/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu134/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu65/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu134/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu65/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu133/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu66/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu133/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu66/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu132/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu67/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu132/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu67/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu131/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu68/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu131/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu68/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu130/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu69/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu130/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu69/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu13/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu7/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu13/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu7/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu129/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu70/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu129/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu70/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu127/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu71/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu127/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu71/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/physical_package_id b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/physical_package_id rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings_list b/tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings_list rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu72/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu126/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu73/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu126/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu73/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu125/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu74/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu125/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu74/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu124/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu75/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu124/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu75/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu123/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu76/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu123/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu76/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu122/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu77/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu122/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu77/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu121/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu78/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu121/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu78/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu12/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu79/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu12/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu79/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu119/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu8/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu119/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu8/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu118/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu80/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu118/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu80/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu117/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu81/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu117/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu81/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu116/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu82/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu116/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu82/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu115/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu83/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu115/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu83/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu114/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu84/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu114/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu84/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu113/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu85/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu113/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu85/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu111/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu86/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu111/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu86/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu110/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu87/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu110/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu87/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu11/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu88/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu11/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu88/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu109/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu89/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu109/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu89/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu108/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu9/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu108/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu9/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu107/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu90/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu107/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu90/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu106/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu91/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu106/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu91/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu105/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu92/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu105/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu92/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu103/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu93/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu103/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu93/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu102/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu94/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu102/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu94/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu101/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu95/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu101/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu95/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu100/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu96/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu100/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu96/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu10/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu97/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu10/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu97/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu1/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu98/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu1/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu98/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu0/online b/tests/nodeinfodata/linux-nonpresent/cpu/cpu99/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu0/online rename to tests/nodeinfodata/linux-nonpresent/cpu/cpu99/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/kernel_max b/tests/nodeinfodata/linux-nonpresent/cpu/kernel_max similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/kernel_max rename to tests/nodeinfodata/linux-nonpresent/cpu/kernel_max diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/offline b/tests/nodeinfodata/linux-nonpresent/cpu/offline similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/offline rename to tests/nodeinfodata/linux-nonpresent/cpu/offline diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/online b/tests/nodeinfodata/linux-nonpresent/cpu/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/online rename to tests/nodeinfodata/linux-nonpresent/cpu/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/possible b/tests/nodeinfodata/linux-nonpresent/cpu/possible similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/possible rename to tests/nodeinfodata/linux-nonpresent/cpu/possible diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/present b/tests/nodeinfodata/linux-nonpresent/cpu/present similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/present rename to tests/nodeinfodata/linux-nonpresent/cpu/present diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu0 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu0 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu1 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu1 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu10 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu10 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu100 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu100 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu101 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu101 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu102 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu102 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu103 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu103 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu11 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu11 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu12 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu12 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu13 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu13 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu14 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu14 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu144 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu144 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu145 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu145 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu146 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu146 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu147 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu147 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu148 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu148 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu149 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu149 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu15 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu15 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu150 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu150 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu151 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu151 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu152 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu152 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu153 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu153 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu154 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu154 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu155 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu155 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu156 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu156 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu157 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu157 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu158 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu158 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu159 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu159 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu16 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu16 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu17 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu17 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu18 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu18 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu19 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu19 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu2 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu2 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu20 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu20 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu21 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu21 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu22 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu22 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu23 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu23 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu24 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu24 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu25 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu25 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu26 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu26 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu27 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu27 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu28 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu28 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu29 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu29 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu3 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu3 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu30 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu30 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu31 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu31 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu32 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu32 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu33 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu33 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu34 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu34 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu35 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu35 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu36 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu36 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu37 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu37 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu38 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu38 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu39 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu39 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu4 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu4 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu5 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu5 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu56 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu56 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu57 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu57 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu58 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu58 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu59 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu59 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu6 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu6 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu60 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu60 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu61 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu61 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu62 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu62 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu63 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu63 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu64 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu64 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu65 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu65 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu66 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu66 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu67 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu67 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu68 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu68 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu69 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu69 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu7 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu7 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu70 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu70 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu71 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu71 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu8 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu8 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu80 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu80 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu81 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu81 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu82 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu82 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu83 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu83 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu84 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu84 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu85 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu85 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu86 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu86 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu87 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu87 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu88 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu88 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu89 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu89 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu9 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu9 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu90 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu90 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu91 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu91 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu92 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu92 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu93 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu93 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu94 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu94 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu95 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu95 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu96 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu96 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu97 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu97 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu98 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu98 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 b/tests/nodeinfodata/linux-nonpresent/node/node0/cpu99 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 rename to tests/nodeinfodata/linux-nonpresent/node/node0/cpu99 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/meminfo b/tests/nodeinfodata/linux-nonpresent/node/node0/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/meminfo rename to tests/nodeinfodata/linux-nonpresent/node/node0/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu40 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu40 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu41 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu41 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu42 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu42 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu43 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu43 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu44 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu44 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu45 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu45 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu46 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu46 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu47 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu47 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu48 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu48 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu49 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu49 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu50 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu50 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu51 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu51 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu52 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu52 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu53 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu53 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu54 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu54 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu55 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu55 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu72 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu72 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu73 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu73 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu74 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu74 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu75 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu75 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu76 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu76 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu77 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu77 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu78 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu78 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 b/tests/nodeinfodata/linux-nonpresent/node/node1/cpu79 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 rename to tests/nodeinfodata/linux-nonpresent/node/node1/cpu79 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/meminfo b/tests/nodeinfodata/linux-nonpresent/node/node1/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/meminfo rename to tests/nodeinfodata/linux-nonpresent/node/node1/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu104 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu104 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu105 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu105 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu106 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu106 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu107 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu107 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu108 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu108 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu109 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu109 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu110 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu110 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu111 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu111 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu112 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu112 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu113 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu113 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu114 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu114 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu115 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu115 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu116 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu116 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu117 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu117 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu118 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu118 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 b/tests/nodeinfodata/linux-nonpresent/node/node16/cpu119 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 rename to tests/nodeinfodata/linux-nonpresent/node/node16/cpu119 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/meminfo b/tests/nodeinfodata/linux-nonpresent/node/node16/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/meminfo rename to tests/nodeinfodata/linux-nonpresent/node/node16/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu120 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu120 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu121 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu121 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu122 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu122 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu123 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu123 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu124 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu124 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu125 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu125 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu126 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu126 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu127 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu127 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu128 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu128 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu129 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu129 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu130 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu130 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu131 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu131 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu132 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu132 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu133 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu133 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu134 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu134 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu135 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu135 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu136 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu136 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu137 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu137 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu138 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu138 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu139 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu139 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu140 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu140 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu141 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu141 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu142 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu142 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 b/tests/nodeinfodata/linux-nonpresent/node/node17/cpu143 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 rename to tests/nodeinfodata/linux-nonpresent/node/node17/cpu143 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/meminfo b/tests/nodeinfodata/linux-nonpresent/node/node17/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/meminfo rename to tests/nodeinfodata/linux-nonpresent/node/node17/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/online b/tests/nodeinfodata/linux-nonpresent/node/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/online rename to tests/nodeinfodata/linux-nonpresent/node/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/possible b/tests/nodeinfodata/linux-nonpresent/node/possible similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/possible rename to tests/nodeinfodata/linux-nonpresent/node/possible diff --git a/tests/nodeinfodata/linux-ppc64-deconfigured-cpus.cpuinfo b/tests/nodeinfodata/linux-ppc64-nonpresent.cpuinfo similarity index 100% rename from tests/nodeinfodata/linux-ppc64-deconfigured-cpus.cpuinfo rename to tests/nodeinfodata/linux-ppc64-nonpresent.cpuinfo diff --git a/tests/nodeinfodata/linux-ppc64-deconfigured-cpus.expected b/tests/nodeinfodata/linux-ppc64-nonpresent.expected similarity index 100% rename from tests/nodeinfodata/linux-ppc64-deconfigured-cpus.expected rename to tests/nodeinfodata/linux-ppc64-nonpresent.expected diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 60467bc..f682593 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -234,7 +234,7 @@ mymain(void) {"raspberrypi", VIR_ARCH_ARMV6L}, {"f21-mustang", VIR_ARCH_AARCH64}, {"rhelsa-3.19.0-mustang", VIR_ARCH_AARCH64}, - {"deconfigured-cpus", VIR_ARCH_PPC64}, + {"nonpresent", VIR_ARCH_PPC64}, }; if (virInitialize() < 0) -- 2.4.3

2 2

[libvirt] [PATCH] remote: fix typo in remoteDomainOpenGraphicsFD
by Daniel P. Berrange 27 Jul '15

27 Jul '15

The remoteDomainOpenGraphicsFD method was using the wrong RPC arg struct remote_domain_open_graphics_args instead of remote_domain_open_graphics_fd_args. Fortunately both structs had identical contents so there was no functional bug, but to avoid consuing future maintainers, we should fix it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 273799b..5c4cf7c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6456,7 +6456,7 @@ remoteDomainOpenGraphicsFD(virDomainPtr dom, unsigned int flags) { int rv = -1; - remote_domain_open_graphics_args args; + remote_domain_open_graphics_fd_args args; struct private_data *priv = dom->conn->privateData; int *fdout = NULL; size_t fdoutlen = 0; -- 2.4.3

2 1

[libvirt] [PATCH] qxl: return 16M instead of 64M in virDomainVideoDefaultRAM
by Lin Ma 27 Jul '15

27 Jul '15

Return 16M for qxl because QEMU uses 16MB as the default video ram size for qxl device since pc-1.2. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6b557d1..8efc973 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11651,8 +11651,10 @@ virDomainVideoDefaultRAM(const virDomainDef *def, return 4 * 1024; case VIR_DOMAIN_VIDEO_TYPE_QXL: - /* QEMU use 64M as the minimal video memory for qxl device */ - return 64 * 1024; + /* By default, QEMU uses 16MB as video memory size + * for qxl device since pc-1.2 + */ + return 16 * 1024; default: return 0; -- 2.1.4

3 5

[libvirt] [PATCH] qemu: fix the audit log is not correct after hot-plug memory success
by Luyao Huang 27 Jul '15

27 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1226234#c3 After hot-plug a memory device success, the audit log show that memory update failed: type=VIRT_RESOURCE ... old-mem=1024000 new-mem=1548288 \ exe="/usr/sbin/libvirtd" hostname=? addr=? terminal=pts/2 res=failed This is because the ret is still -1 when we call audit function to help Also we need audit when hot-plug/hot-unplug get failed in qemu side. And i notice we use virDomainDefGetMemoryActual to get the newmem , but when we failed to attach the memory device we the virDomainDefGetMemoryActual will still output the oldmem size, so the audit log will not right in that case. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_hotplug.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1ea397f..cf7ffa9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1745,6 +1745,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); unsigned long long oldmem = virDomainDefGetMemoryActual(vm->def); + unsigned long long newmem = oldmem + mem->size; char *devstr = NULL; char *objalias = NULL; const char *backendType; @@ -1800,7 +1801,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) { /* we shouldn't touch mem now, as the def might be freed */ mem = NULL; - goto cleanup; + goto audit; } event = virDomainEventDeviceAddedNewFromObj(vm, objalias); @@ -1811,9 +1812,6 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (fix_balloon) vm->def->mem.cur_balloon += mem->size; - virDomainAuditMemory(vm, oldmem, virDomainDefGetMemoryActual(vm->def), - "update", ret == 0); - /* mem is consumed by vm->def */ mem = NULL; @@ -1823,6 +1821,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, ret = 0; + audit: + virDomainAuditMemory(vm, oldmem, newmem, "update", ret == 0); cleanup: virObjectUnref(cfg); VIR_FREE(devstr); @@ -1833,7 +1833,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, removedef: if (qemuDomainObjExitMonitor(driver, vm) < 0) { mem = NULL; - goto cleanup; + goto audit; } if ((id = virDomainMemoryFindByDef(vm->def, mem)) >= 0) @@ -1841,7 +1841,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, else mem = NULL; - goto cleanup; + goto audit; } @@ -2904,11 +2904,11 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; unsigned long long oldmem = virDomainDefGetMemoryActual(vm->def); + unsigned long long newmem = oldmem - mem->size; virObjectEventPtr event; char *backendAlias = NULL; int rc; int idx; - int ret = -1; VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); @@ -2917,27 +2917,23 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, qemuDomainEventQueue(driver, event); if (virAsprintf(&backendAlias, "mem%s", mem->info.alias) < 0) - goto cleanup; + return -1; qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDelObject(priv->mon, backendAlias); + VIR_FREE(backendAlias); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - goto cleanup; + return -1; vm->def->mem.cur_balloon -= mem->size; + virDomainAuditMemory(vm, oldmem, newmem, "update", rc == 0); + if ((idx = virDomainMemoryFindByDef(vm->def, mem)) >= 0) virDomainMemoryRemove(vm->def, idx); virDomainMemoryDefFree(mem); - ret = 0; - - cleanup: - virDomainAuditMemory(vm, oldmem, virDomainDefGetMemoryActual(vm->def), - "update", ret == 0); - - VIR_FREE(backendAlias); - return ret; + return 0; } -- 1.8.3.1

3 2

[libvirt] [PATCH] tests: Finish rename of the long nodeinfo test case
by Martin Kletzander 27 Jul '15

27 Jul '15

Commit 2094d01e2f54e5774c0d0d380e83154b42ea65be forgot to rename two more files. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. ...ux-ppc64-deconfigured-cpus.cpuinfo => linux-ppc64-deconf-cpus.cpuinfo} | 0 ...-ppc64-deconfigured-cpus.expected => linux-ppc64-deconf-cpus.expected} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/nodeinfodata/{linux-ppc64-deconfigured-cpus.cpuinfo => linux-ppc64-deconf-cpus.cpuinfo} (100%) rename tests/nodeinfodata/{linux-ppc64-deconfigured-cpus.expected => linux-ppc64-deconf-cpus.expected} (100%) diff --git a/tests/nodeinfodata/linux-ppc64-deconfigured-cpus.cpuinfo b/tests/nodeinfodata/linux-ppc64-deconf-cpus.cpuinfo similarity index 100% rename from tests/nodeinfodata/linux-ppc64-deconfigured-cpus.cpuinfo rename to tests/nodeinfodata/linux-ppc64-deconf-cpus.cpuinfo diff --git a/tests/nodeinfodata/linux-ppc64-deconfigured-cpus.expected b/tests/nodeinfodata/linux-ppc64-deconf-cpus.expected similarity index 100% rename from tests/nodeinfodata/linux-ppc64-deconfigured-cpus.expected rename to tests/nodeinfodata/linux-ppc64-deconf-cpus.expected -- 2.4.6

2 1

[libvirt] [PATCH] admin: Tiny cleanups
by Martin Kletzander 27 Jul '15

27 Jul '15

First hunk changes the use of srcdir to top_srcdir so it complies with other rules in the Makefile. Second one removes the need of remote_protocol.h in admin_protocol.h as it was suggested and worked in, but this one line was missed apparently. Last one just removes the 'remote' naming from admin protocol specification, just so it's cleaner. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/Makefile.am | 4 ++-- src/admin/admin_protocol.x | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index d3fc029f0580..59bc4d4eddfd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -101,9 +101,9 @@ qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server qemu QEMU $(QEMU_PROTOCOL) \ > $(srcdir)/qemu_dispatch.h -admin_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \ +admin_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) - $(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \ + $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server admin ADMIN $(ADMIN_PROTOCOL) \ > $(srcdir)/admin_dispatch.h diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 1a2e94ee86e7..cfc92ff74852 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -22,18 +22,16 @@ * Author: Martin Kletzander <mkletzan(a)redhat.com> */ -%#include "remote_protocol.h" - /*----- Data types. -----*/ /* Length of long, but not unbounded, strings. * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const REMOTE_STRING_MAX = 4194304; +const ADMIN_STRING_MAX = 4194304; /* A long string, which may NOT be NULL. */ -typedef string admin_nonnull_string<REMOTE_STRING_MAX>; +typedef string admin_nonnull_string<ADMIN_STRING_MAX>; /* A long string, which may be NULL. */ typedef admin_nonnull_string *admin_string; -- 2.4.6

2 1

[libvirt] [PATCH] qemu: Check for iotune_max support properly
by Martin Kletzander 27 Jul '15

27 Jul '15

Commit d506a51aeb2a7a7b0c963f760e32b94376ea7173 meant to check for QEMU_CAPS_DRIVE_IOTUNE_MAX, but checked for QEMU_CAPS_DRIVE_IOTUNE instead. That's clearly visible from the diff, but it got in. Because of that, we were supplying information unknown for QEMU if it wasn't new enough and we couldn't even properly handle the error, leading to "Unexpected error". Also iops_size came at the same time with all the other "_max" options, so check whether we're not setting that either if QEMU_CAPS_DRIVE_IOTUNE_MAX is not supported. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1224053 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 40c882c4ba88..a761448ebaa0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17580,7 +17580,8 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - supportMaxOptions = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); + supportMaxOptions = virQEMUCapsGet(priv->qemuCaps, + QEMU_CAPS_DRIVE_IOTUNE_MAX); if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("block I/O throttling not supported with this " @@ -17588,12 +17589,13 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto endjob; } - if (!supportMaxOptions && (set_iops_max || set_bytes_max)) { + if (!supportMaxOptions && + (set_iops_max || set_bytes_max || set_size_iops)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("a block I/O throttling parameter is not " "supported with this QEMU binary")); goto endjob; - } + } if (!(device = qemuDiskPathToAlias(vm, disk, &idx))) goto endjob; -- 2.4.6

2 1

[libvirt] [PATCH pushed] Renamed deconfigured-cpus to allow make dist
by Daniel Veillard 27 Jul '15

27 Jul '15

Simplest was just to rename that extra long name and move files in git accordingly Pushed directly as build breaker Daniel diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 60467bc..3fffdb2 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -234,7 +234,7 @@ mymain(void) {"raspberrypi", VIR_ARCH_ARMV6L}, {"f21-mustang", VIR_ARCH_AARCH64}, {"rhelsa-3.19.0-mustang", VIR_ARCH_AARCH64}, - {"deconfigured-cpus", VIR_ARCH_PPC64}, + {"deconf-cpus", VIR_ARCH_PPC64}, }; if (virInitialize() < 0) diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu99/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu0/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu99/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu0/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu98/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu1/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu98/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu1/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu97/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu10/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu97/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu10/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu96/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu100/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu96/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu100/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu95/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu101/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu95/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu101/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu94/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu102/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu94/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu102/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu93/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu103/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu93/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu103/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu92/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu105/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu92/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu105/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu91/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu106/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu91/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu106/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu90/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu107/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu90/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu107/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu9/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu108/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu9/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu108/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu89/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu109/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu89/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu109/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu88/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu11/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu88/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu11/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu87/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu110/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu87/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu110/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu86/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu111/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu86/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu111/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu85/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu113/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu85/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu113/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu84/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu114/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu84/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu114/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu83/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu115/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu83/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu115/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu82/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu116/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu82/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu116/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu81/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu117/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu81/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu117/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu80/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu118/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu80/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu118/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu8/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu119/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu8/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu119/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu79/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu12/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu79/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu12/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu78/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu121/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu78/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu121/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu77/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu122/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu77/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu122/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu76/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu123/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu76/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu123/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu75/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu124/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu75/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu124/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu74/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu125/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu74/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu125/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu73/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu126/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu73/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu126/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu71/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu127/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu71/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu127/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu70/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu129/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu70/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu129/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu7/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu13/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu7/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu13/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu69/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu130/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu69/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu130/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu68/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu131/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu68/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu131/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu67/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu132/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu67/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu132/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu66/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu133/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu66/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu133/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu65/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu134/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu65/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu134/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu64/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu135/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu64/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu135/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu63/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu137/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu63/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu137/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu62/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu138/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu62/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu138/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu61/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu139/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu61/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu139/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu60/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu14/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu60/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu14/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu6/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu140/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu6/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu140/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu59/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu141/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu59/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu141/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu58/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu142/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu58/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu142/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu57/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu143/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu57/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu143/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu56/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu144/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu56/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu144/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu55/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu145/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu55/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu145/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu54/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu146/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu54/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu146/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu53/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu147/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu53/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu147/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu52/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu148/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu52/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu148/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu51/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu149/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu51/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu149/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu50/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu15/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu50/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu15/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu5/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu150/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu5/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu150/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu49/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu151/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu49/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu151/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu47/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu152/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu47/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu152/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu46/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu153/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu46/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu153/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu45/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu154/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu45/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu154/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu44/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu155/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu44/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu155/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu43/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu156/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu43/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu156/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu42/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu157/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu42/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu157/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu41/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu158/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu41/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu158/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu4/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu159/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu4/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu159/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu136/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu39/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu17/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu39/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu17/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu38/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu18/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu38/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu18/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu37/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu19/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu37/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu19/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu36/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu2/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu36/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu2/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu35/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu20/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu35/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu20/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu34/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu21/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu34/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu21/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu33/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu22/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu33/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu22/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu32/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu23/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu32/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu23/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu128/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu16/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu24/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu31/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu25/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu31/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu25/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu30/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu26/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu30/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu26/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu3/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu27/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu3/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu27/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu29/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu28/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu29/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu28/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu28/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu29/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu28/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu29/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu27/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu3/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu27/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu3/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu26/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu30/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu26/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu30/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu25/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu31/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu25/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu31/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu23/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu32/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu23/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu32/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu22/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu33/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu22/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu33/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu21/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu34/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu21/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu34/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu20/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu35/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu20/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu35/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu2/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu36/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu2/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu36/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu19/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu37/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu19/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu37/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu18/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu38/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu18/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu38/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu17/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu39/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu17/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu39/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu159/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu4/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu159/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu4/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu120/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu158/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu41/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu158/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu41/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu157/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu42/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu157/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu42/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu156/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu43/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu156/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu43/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu155/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu44/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu155/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu44/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu154/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu45/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu154/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu45/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu153/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu46/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu153/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu46/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu152/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu47/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu152/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu47/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu112/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu48/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu151/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu49/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu151/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu49/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu150/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu5/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu150/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu5/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu15/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu50/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu15/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu50/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu149/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu51/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu149/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu51/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu148/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu52/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu148/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu52/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu147/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu53/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu147/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu53/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu146/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu54/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu146/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu54/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu145/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu55/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu145/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu55/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu144/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu56/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu144/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu56/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu143/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu57/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu143/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu57/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu142/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu58/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu142/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu58/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu141/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu59/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu141/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu59/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu140/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu6/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu140/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu6/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu14/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu60/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu14/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu60/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu139/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu61/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu139/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu61/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu138/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu62/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu138/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu62/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu137/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu63/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu137/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu63/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu135/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu64/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu135/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu64/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu134/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu65/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu134/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu65/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu133/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu66/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu133/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu66/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu132/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu67/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu132/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu67/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu131/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu68/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu131/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu68/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu130/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu69/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu130/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu69/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu13/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu7/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu13/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu7/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu129/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu70/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu129/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu70/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu127/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu71/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu127/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu71/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu104/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/core_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/core_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/physical_package_id b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/physical_package_id similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu40/topology/physical_package_id rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/physical_package_id diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings_list b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings_list similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu72/topology/thread_siblings_list rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings_list diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu126/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu73/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu126/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu73/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu125/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu74/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu125/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu74/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu124/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu75/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu124/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu75/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu123/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu76/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu123/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu76/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu122/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu77/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu122/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu77/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu121/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu78/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu121/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu78/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu12/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu79/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu12/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu79/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu119/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu8/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu119/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu8/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu118/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu80/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu118/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu80/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu117/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu81/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu117/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu81/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu116/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu82/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu116/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu82/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu115/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu83/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu115/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu83/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu114/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu84/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu114/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu84/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu113/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu85/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu113/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu85/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu111/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu86/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu111/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu86/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu110/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu87/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu110/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu87/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu11/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu88/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu11/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu88/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu109/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu89/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu109/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu89/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu108/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu9/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu108/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu9/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu107/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu90/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu107/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu90/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu106/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu91/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu106/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu91/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu105/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu92/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu105/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu92/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu103/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu93/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu103/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu93/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu102/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu94/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu102/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu94/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu101/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu95/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu101/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu95/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu100/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu96/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu100/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu96/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu10/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu97/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu10/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu97/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu1/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu98/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu1/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu98/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu0/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/cpu99/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/cpu0/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/cpu99/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/kernel_max b/tests/nodeinfodata/linux-deconf-cpus/cpu/kernel_max similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/kernel_max rename to tests/nodeinfodata/linux-deconf-cpus/cpu/kernel_max diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/offline b/tests/nodeinfodata/linux-deconf-cpus/cpu/offline similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/offline rename to tests/nodeinfodata/linux-deconf-cpus/cpu/offline diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/online b/tests/nodeinfodata/linux-deconf-cpus/cpu/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/online rename to tests/nodeinfodata/linux-deconf-cpus/cpu/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/possible b/tests/nodeinfodata/linux-deconf-cpus/cpu/possible similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/possible rename to tests/nodeinfodata/linux-deconf-cpus/cpu/possible diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/cpu/present b/tests/nodeinfodata/linux-deconf-cpus/cpu/present similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/cpu/present rename to tests/nodeinfodata/linux-deconf-cpus/cpu/present diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu0 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu0 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu1 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu1 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu10 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu10 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu100 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu100 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu101 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu101 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu102 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu102 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu103 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu103 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu11 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu11 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu12 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu12 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu13 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu13 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu14 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu14 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu144 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu144 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu145 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu145 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu146 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu146 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu147 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu147 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu148 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu148 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu149 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu149 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu15 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu15 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu150 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu150 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu151 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu151 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu152 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu152 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu153 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu153 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu154 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu154 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu155 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu155 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu156 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu156 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu157 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu157 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu158 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu158 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu159 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu159 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu16 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu16 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu17 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu17 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu18 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu18 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu19 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu19 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu2 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu2 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu20 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu20 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu21 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu21 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu22 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu22 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu23 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu23 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu24 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu24 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu25 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu25 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu26 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu26 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu27 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu27 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu28 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu28 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu29 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu29 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu3 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu3 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu30 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu30 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu31 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu31 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu32 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu32 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu33 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu33 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu34 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu34 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu35 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu35 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu36 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu36 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu37 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu37 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu38 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu38 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu39 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu39 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu4 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu4 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu5 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu5 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu56 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu56 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu57 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu57 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu58 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu58 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu59 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu59 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu6 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu6 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu60 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu60 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu61 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu61 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu62 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu62 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu63 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu63 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu64 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu64 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu65 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu65 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu66 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu66 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu67 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu67 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu68 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu68 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu69 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu69 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu7 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu7 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu70 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu70 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu71 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu71 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu8 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu8 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu80 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu80 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu81 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu81 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu82 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu82 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu83 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu83 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu84 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu84 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu85 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu85 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu86 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu86 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu87 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu87 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu88 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu88 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu89 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu89 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu9 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu9 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu90 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu90 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu91 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu91 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu92 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu92 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu93 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu93 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu94 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu94 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu95 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu95 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu96 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu96 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu97 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu97 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu98 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu98 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 b/tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu99 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/cpu99 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node0/meminfo b/tests/nodeinfodata/linux-deconf-cpus/node/node0/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node0/meminfo rename to tests/nodeinfodata/linux-deconf-cpus/node/node0/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu40 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu40 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu41 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu41 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu42 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu42 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu43 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu43 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu44 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu44 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu45 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu45 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu46 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu46 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu47 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu47 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu48 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu48 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu49 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu49 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu50 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu50 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu51 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu51 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu52 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu52 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu53 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu53 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu54 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu54 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu55 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu55 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu72 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu72 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu73 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu73 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu74 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu74 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu75 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu75 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu76 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu76 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu77 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu77 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu78 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu78 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 b/tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu79 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/cpu79 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node1/meminfo b/tests/nodeinfodata/linux-deconf-cpus/node/node1/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node1/meminfo rename to tests/nodeinfodata/linux-deconf-cpus/node/node1/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu104 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu104 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu105 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu105 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu106 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu106 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu107 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu107 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu108 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu108 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu109 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu109 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu110 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu110 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu111 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu111 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu112 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu112 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu113 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu113 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu114 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu114 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu115 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu115 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu116 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu116 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu117 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu117 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu118 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu118 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 b/tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu119 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/cpu119 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node16/meminfo b/tests/nodeinfodata/linux-deconf-cpus/node/node16/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node16/meminfo rename to tests/nodeinfodata/linux-deconf-cpus/node/node16/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu120 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu120 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu121 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu121 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu122 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu122 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu123 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu123 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu124 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu124 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu125 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu125 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu126 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu126 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu127 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu127 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu128 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu128 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu129 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu129 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu130 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu130 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu131 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu131 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu132 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu132 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu133 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu133 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu134 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu134 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu135 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu135 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu136 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu136 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu137 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu137 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu138 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu138 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu139 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu139 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu140 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu140 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu141 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu141 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu142 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu142 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 b/tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu143 similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/cpu143 diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/node17/meminfo b/tests/nodeinfodata/linux-deconf-cpus/node/node17/meminfo similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/node17/meminfo rename to tests/nodeinfodata/linux-deconf-cpus/node/node17/meminfo diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/online b/tests/nodeinfodata/linux-deconf-cpus/node/online similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/online rename to tests/nodeinfodata/linux-deconf-cpus/node/online diff --git a/tests/nodeinfodata/linux-deconfigured-cpus/node/possible b/tests/nodeinfodata/linux-deconf-cpus/node/possible similarity index 100% rename from tests/nodeinfodata/linux-deconfigured-cpus/node/possible rename to tests/nodeinfodata/linux-deconf-cpus/node/possible -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/2] fix the error when get the vcpupin info and add a test
by Luyao Huang 27 Jul '15

27 Jul '15

I was so ashamed of writing a incorrect commit '848ab68' and didn't test with it. Patch 1/2 fix the issue and Patch 2/2 introduce a test for it. Luyao Huang (2): virsh: really fix the error if vcpu number exceed the guest maxvcpu number test: introduce a function in test driver for check get vcpupin info src/test/test_driver.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/vcpupin | 34 +++++++++++++++++++++++++++---- tools/virsh-domain.c | 4 ++-- 3 files changed, 87 insertions(+), 6 deletions(-) -- 1.8.3.1

3 6

[libvirt] [PATCH 0/2] Add support for ioeventfd for virtio-scsi
by Martin Kletzander 26 Jul '15

26 Jul '15

This series is based on top of Laine's v3 of Add new PCIe controllers. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1150484 Martin Kletzander (2): conf: Add ioeventfd option for controllers qemu: Enable ioeventfd usage for virtio-scsi controllers docs/formatdomain.html.in | 8 ++++++ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 19 ++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 8 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml -- 2.4.6

1 3

[libvirt] [PATCHv2 00/17] Add new PCIe controllers
by Laine Stump 25 Jul '15

25 Jul '15

I had previously sent patches adding these new controller types: pcie-root-port pcie-switch-upstream-port pcie-switch-downstream-port but there were issues with where the device name and guest-visible attributes should be stored in the XML: https://www.redhat.com/archives/libvir-list/2015-June/msg01084.html In the end, I *think* we all agreed with mkletzan's suggestion to use this: <controller type='pci' model='pcie-root-port'> <model type='ioh3420'/> <target chassis='5' port='0x18'/> ... </controller> so that is what I implemented this time around. (note that the stuff in <model> and <target> are almost always auto-generated by libvirt, just like PCI addresses, but need to remain stable to preserve guest ABI during migration) The first 4 patches of the original series (removing restrictions on attaching a PCI device to a PCIe port or vice versa) were ACKed and have already been pushed. In this series, there are new patches 1 - 3 which are completely new (2 is a bugfix, 1,3,4 are fixing up the code to make later additions cleaner), then 5-6 implementing <model>, 7-8 implementing <target>, and finally 9-17 which are V2's of 5-13 in the original posting. Laine Stump (17): conf: reorganize virNetworkDHCPDefParseXML conf: pay attention to bus minSlot/maxSlot when autoassigning PCI addresses qemu: reorganize loop in qemuDomainAssignPCIAddresses conf: add virDomainControllerDefNew() conf: add new <model> subelement with type attribute to <controller> qemu: implement <model> subelement to <controller> conf: add new <target> subelement with chassisNr attribute to <controller> qemu: implement <target chassisNr='n'/> subelement/attribute of <controller> qemu: add capabilities bit for device ioh3420 conf: new pci controller model "pcie-root-port" qemu: support new pci controller model "pcie-root-port" qemu: add capabilities bit for device x3130-upstream conf: new pci controller model "pcie-switch-upstream-port" qemu: support new pci controller model "pcie-switch-upstream-port" qemu: add capabilities bit for device xio3130-downstream conf: new pcie-controller model "pcie-switch-downstream-port" qemu: support new pci controller model "pcie-switch-downstream-port" docs/formatdomain.html.in | 84 +++++++- docs/schemas/domaincommon.rng | 42 ++++ src/conf/domain_addr.c | 97 +++++++--- src/conf/domain_addr.h | 12 +- src/conf/domain_conf.c | 148 +++++++++++--- src/conf/domain_conf.h | 23 +++ src/conf/network_conf.c | 36 ++-- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_command.c | 214 +++++++++++++++++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 3 + tests/qemuhelptest.c | 10 +- .../qemuxml2argv-pcie-root-port.args | 10 + .../qemuxml2argv-pcie-root-port.xml | 36 ++++ .../qemuxml2argv-pcie-switch-downstream-port.args | 18 ++ .../qemuxml2argv-pcie-switch-downstream-port.xml | 44 +++++ .../qemuxml2argv-pcie-switch-upstream-port.args | 12 ++ .../qemuxml2argv-pcie-switch-upstream-port.xml | 37 ++++ tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 9 +- tests/qemuxml2argvtest.c | 25 +++ tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 9 +- tests/qemuxml2xmltest.c | 3 + 29 files changed, 809 insertions(+), 96 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml -- 2.1.0

4 66

[libvirt] [PATCH 1/2] storage: allow zero capacity with non-backing file to be created
by Chris J Arges 24 Jul '15

24 Jul '15

In commit fbcf7da95, a change was introduced that no longer allowed defining volumes via XML with a capacity of '0'. Because we check for info.size_arg to be non-zero, this use-case fails. This patch allows info.size_arg to be zero if no backing store is specified. Signed-off-by: Chris J Arges <chris.j.arges(a)canonical.com> --- src/storage/storage_backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index ce59f63..c661662 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1068,7 +1068,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn, if (info.inputPath) virCommandAddArg(cmd, info.inputPath); virCommandAddArg(cmd, info.path); - if (!info.inputPath && info.size_arg) + if (!info.inputPath && (info.size_arg || !info.backingPath)) virCommandAddArgFormat(cmd, "%lluK", info.size_arg); return cmd; -- 1.9.1

3 5

[libvirt] Plan for next release
by Daniel Veillard 24 Jul '15

24 Jul '15

We are getting close to the end of the month, so we may need to freeze next Monday or Tuesday. Are we ready for 1.3.0 now :-) ? I see that configure.ac targets 1.2.18, so a priori no, but would rather have a clear answer :-) Thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 6

[libvirt] [PATCH glib 0/2] Clarify min required versions of deps
by Daniel P. Berrange 24 Jul '15

24 Jul '15

This sets out a policy for deciding when it is reasonable to increase the min required versions of external deps, and then updates current min versions accordingly. The aim is to ensure libvirt-glib is easily buildable on latest enterprise and community distros, to maximise the pool of possible contributors to the project and simplify life for the distro maintainers packaging it. Daniel P. Berrange (2): README: formally document intended platform support targets configure.ac: update min required versions README | 67 +++++++++++++++++++++++++++++++++++++++++++++++++----------- configure.ac | 8 +++----- 2 files changed, 58 insertions(+), 17 deletions(-) -- 2.4.3

2 7

[libvirt] [PATCH v2] fix typo in qemu_monitor
by Cao jin 24 Jul '15

24 Jul '15

Signed-off-by: Cao jin <caoj.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1e7b6bb..860e242 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -259,7 +259,7 @@ void qemuMonitorSetOptions(qemuMonitorPtr mon, virJSONValuePtr options) ATTRIBUTE_NONNULL(1); int qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, - const char *videName) + const char *videoName) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, const char *cmd, -- 2.1.0

2 1

[libvirt] [PATCH] fix typo in qemu_monitor
by Cao jin 24 Jul '15

24 Jul '15

Signed-off-by: Cao jin <caoj.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 15ba39b..beaf585 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3345,7 +3345,7 @@ qemuMonitorVMStatusToPausedReason(const char *status) case QEMU_MONITOR_VM_STATUS_WATCHDOG: return VIR_DOMAIN_PAUSED_WATCHDOG; - case QEMU_MONITOR_VM_STATUS_GUEST_PANICKED: + case QEMU_MONITOR_VM_STATUS_GUEST_PANICED: return VIR_DOMAIN_PAUSED_CRASHED; /* unreachable from this point on */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1e7b6bb..f12aa99 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -259,7 +259,7 @@ void qemuMonitorSetOptions(qemuMonitorPtr mon, virJSONValuePtr options) ATTRIBUTE_NONNULL(1); int qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, - const char *videName) + const char *videoName) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, const char *cmd, @@ -342,7 +342,7 @@ typedef enum { QEMU_MONITOR_VM_STATUS_SAVE_VM, QEMU_MONITOR_VM_STATUS_SHUTDOWN, QEMU_MONITOR_VM_STATUS_WATCHDOG, - QEMU_MONITOR_VM_STATUS_GUEST_PANICKED, + QEMU_MONITOR_VM_STATUS_GUEST_PANICED, QEMU_MONITOR_VM_STATUS_LAST } qemuMonitorVMStatus; -- 2.1.0

3 2

[libvirt] [libvirt-glib] events: Mark 'eventlock' as static
by Christophe Fergeau 24 Jul '15

24 Jul '15

It's not used outside of the libvirt-glib-event.c file, so there is no good reason for not having it static. As it was not listed in libvirt-glib.sym, this will make no change to the publicly exported symbols (ie this is not an ABI change). --- libvirt-glib/libvirt-glib-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index f8227d6..4548aa6 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -110,7 +110,7 @@ struct gvir_event_timeout virFreeCallback ff; }; -GMutex *eventlock = NULL; +static GMutex *eventlock = NULL; static int nextwatch = 1; static GPtrArray *handles; -- 2.4.3

1 0