- Devel - libvirt List Archives

[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 27 Jul '15

27 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

[libvirt] [PATCH] nodeinfo: Check for SYSFS_INFINIBAND_DIR before open
by John Ferlan 24 Jul '15

24 Jul '15

Commit id 'ac3ed2085' causes 'virsh nodedev-list --cap net' to fail on any system without SYSFS_INFINIBAND_DIR (/sys/class/infiniband). Rather than assume it's there and fail on the attempt to open the non-existent directory, check if it's there - if not, return success and move on. As reported by Suren Hajyan <shajyan(a)redhat.com> from run of unit tests Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virnetdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7d91e2c..eb6a9fb 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2976,6 +2976,9 @@ virNetDevRDMAFeature(const char *ifname, struct dirent *dp; int ret = -1; + if (!virFileExists(SYSFS_INFINIBAND_DIR)) + return 0; + if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) { virReportSystemError(errno, _("Failed to opendir path '%s'"), -- 2.1.0

2 1

[libvirt] [PATCH] conf: more useful error message when pci function is out of range
by Laine Stump 23 Jul '15

23 Jul '15

If a pci address had a function number out of range, the error message would be: Insufficient specification for PCI address This was due to an unnecessary call to virDevicePCIAddressIsValid() during parse of the pci address - we will anyway check for validity of the PCI address later on. With that extra check removed, the error message is the much more useful: Invalid PCI address 0000:02:06.8. function must be <= 7 This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1004596 --- src/conf/device_conf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index e7b7957..09a7019 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -1,7 +1,7 @@ /* * device_conf.c: device XML handling * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -115,11 +115,6 @@ virDevicePCIAddressParseXML(xmlNodePtr node, goto cleanup; } - if (!virDevicePCIAddressIsValid(addr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Insufficient specification for PCI address")); - goto cleanup; - } ret = 0; -- 2.1.0

2 3

[libvirt] [PATCH] nodeinfo: Check for errors when reading core_id
by Andrea Bolognani 23 Jul '15

23 Jul '15

--- src/nodeinfo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index fb932c8..ba633a1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -512,7 +512,9 @@ virNodeParseNode(const char *node, /* logical cpu is equivalent to a core on s390 */ core = cpu; } else { - core = virNodeGetCpuValue(node, cpu, "topology/core_id", 0); + if ((core = virNodeGetCpuValue(node, cpu, + "topology/core_id", 0)) < 0) + goto cleanup; } if (core > ID_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.4.3

2 1

[libvirt] [PATCH] netdev: fix build on FreeBSD
by Roman Bogorodskiy 23 Jul '15

23 Jul '15

Commit ac3ed20 breaks build on FreeBSD with: CC util/libvirt_util_la-virnetdev.lo util/virnetdev.c:2967:1: error: unused function 'virNetDevRDMAFeature' [-Werror,-Wunused-function] virNetDevRDMAFeature(const char *ifname, ^ So hide virNetDevRDMAFeature function under the #ifdef 'SIOCETHTOOL' and 'HAVE_STRUCT_IFREQ' section. Pushed under the build breaker rule. --- src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 8981a84..7d91e2c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2952,6 +2952,7 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } +#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** * virNetDevRDMAFeature @@ -3014,7 +3015,6 @@ virNetDevRDMAFeature(const char *ifname, return ret; } -#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** * virNetDevSendEthtoolIoctl -- 2.3.7

2 1

[libvirt] [PATCH 1/2] bhyve: add UTC clock support
by Roman Bogorodskiy 23 Jul '15

23 Jul '15

Bhyve as of r279225 (FreeBSD -CURRENT) or r284894 (FreeBSD 10-STABLE) supports using UTC time offset via the '-u' argument to bhyve(8). By default it's still using localtime. Make the bhyve driver use UTC clock if it's requested by specifying <clock offset='utc'> in domain XML and if the bhyve(8) binary supports the '-u' flag. --- src/bhyve/bhyve_capabilities.c | 31 ++++++++++++++++++++++ src/bhyve/bhyve_capabilities.h | 5 ++++ src/bhyve/bhyve_command.c | 21 +++++++++++++++ src/bhyve/bhyve_driver.c | 13 +++++++++ src/bhyve/bhyve_driver.h | 2 ++ src/bhyve/bhyve_utils.h | 1 + .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +- .../bhyvexml2argv-custom-loader.args | 2 +- .../bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../bhyvexml2argv-disk-cdrom.args | 2 +- .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-grub-bootorder.args | 2 +- .../bhyvexml2argv-grub-bootorder2.args | 2 +- .../bhyvexml2argv-grub-defaults.args | 2 +- .../bhyvexml2argvdata/bhyvexml2argv-localtime.args | 3 +++ .../bhyvexml2argv-localtime.ldargs | 1 + .../bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 23 ++++++++++++++++ tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argv-serial-grub.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +- tests/bhyvexml2argvtest.c | 2 ++ 25 files changed, 117 insertions(+), 15 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 3a55879..9b21649 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -141,3 +141,34 @@ virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) VIR_FREE(binary); return ret; } + +int +virBhyveProbeCaps(virBhyveCapsFlags *caps) +{ + char *binary, *help; + virCommandPtr cmd = NULL; + int ret = 0, exit; + + binary = virFindFileInPath("bhyve"); + if (binary == NULL) + goto out; + if (!virFileIsExecutable(binary)) + goto out; + + cmd = virCommandNew(binary); + virCommandAddArg(cmd, "-h"); + virCommandSetErrorBuffer(cmd, &help); + if (virCommandRun(cmd, &exit) < 0) { + ret = -1; + goto out; + } + + if (strstr(help, "-u:") != NULL) + *caps |= BHYVE_CAP_RTC_UTC; + + out: + VIR_FREE(help); + virCommandFree(cmd); + VIR_FREE(binary); + return ret; +} diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index ccd8eb6..df7218f 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -31,6 +31,11 @@ typedef enum { BHYVE_GRUB_CAP_CONSDEV = 1, } virBhyveGrubCapsFlags; +typedef enum { + BHYVE_CAP_RTC_UTC = 1, +} virBhyveCapsFlags; + int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); +int virBhyveProbeCaps(virBhyveCapsFlags *caps); #endif diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 5e31ca6..6576029 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -245,6 +245,27 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_TRISTATE_SWITCH_ON) virCommandAddArg(cmd, "-I"); /* Present ioapic to the guest */ + switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + /* used by default in bhyve */ + break; + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_RTC_UTC) != 0) { + virCommandAddArg(cmd, "-u"); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Installed bhyve binary does not support " + "UTC clock")); + goto error; + } + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock offset '%s'"), + virDomainClockOffsetTypeToString(def->clock.offset)); + goto error; + } + /* Clarification about -H and -P flags from Peter Grehan: * -H and -P flags force the guest to exit when it executes IA32 HLT and PAUSE * instructions respectively. diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 85b7c8f..7f365b1 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1181,6 +1181,9 @@ bhyveStateInitialize(bool privileged, if (!(bhyve_driver->caps = virBhyveCapsBuild())) goto cleanup; + if (virBhyveProbeCaps(&bhyve_driver->bhyvecaps) < 0) + goto cleanup; + if (virBhyveProbeGrubCaps(&bhyve_driver->grubcaps) < 0) goto cleanup; @@ -1240,6 +1243,16 @@ bhyveStateInitialize(bool privileged, } unsigned +bhyveDriverGetCaps(virConnectPtr conn) +{ + bhyveConnPtr driver = conn->privateData; + + if (driver != NULL) + return driver->bhyvecaps; + return 0; +} + +unsigned bhyveDriverGetGrubCaps(virConnectPtr conn) { bhyveConnPtr driver = conn->privateData; diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index af2424a..221d5a0 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -25,6 +25,8 @@ int bhyveRegister(void); +unsigned bhyveDriverGetCaps(virConnectPtr conn); + unsigned bhyveDriverGetGrubCaps(virConnectPtr conn); #endif /* __BHYVE_DRIVER_H__ */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index bbaa3a3..4bccdcc 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -46,6 +46,7 @@ struct _bhyveConn { virCloseCallbacksPtr closeCallbacks; + unsigned bhyvecaps; unsigned grubcaps; }; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args index 79f8e88..6b26964 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -A -I -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -A -I -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args index 4122e62..118735e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args index 4122e62..118735e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args index df50290..3119777 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ -s 1,lpc -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args index 4122e62..118735e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args index eb38969..2b1281f 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args index eb38969..2b1281f 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args index 1638d54..da0577c 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,virtio-blk,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args index eaba370..fc0522d 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd1.img \ -s 2:0,ahci-hd,/tmp/freebsd2.img \ diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args index eaba370..fc0522d 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd1.img \ -s 2:0,ahci-hd,/tmp/freebsd2.img \ diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args index 4122e62..118735e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args new file mode 100644 index 0000000..4122e62 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args @@ -0,0 +1,3 @@ +/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs new file mode 100644 index 0000000..215d65f --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs @@ -0,0 +1 @@ +/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml new file mode 100644 index 0000000..f62c626 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml @@ -0,0 +1,23 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <clock offset='localtime'/> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args index f914865..77c3a17 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args @@ -1,3 +1,3 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:22:ee:11 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args index df50290..3119777 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ -s 1,lpc -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args index df50290..3119777 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ -s 1,lpc -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args index df50290..3119777 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args @@ -1,4 +1,4 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ -s 1,lpc -l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index fa6f87f..3e57a78 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -118,6 +118,7 @@ mymain(void) } while (0) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; + driver.bhyvecaps = BHYVE_CAP_RTC_UTC; DO_TEST("base"); DO_TEST("acpiapic"); @@ -133,6 +134,7 @@ mymain(void) DO_TEST("custom-loader"); DO_TEST("disk-cdrom-grub"); DO_TEST("serial-grub"); + DO_TEST("localtime"); driver.grubcaps = 0; -- 2.3.7

2 5

[libvirt] [PATCH v7 0/5] nodeinfo: Add support for subcores
by Andrea Bolognani 22 Jul '15

22 Jul '15

Changes from v6 to v7: * rebased on top of master now that the series this one builds on have been merged Again, I'm only sending patch 1/5 to the list because the rest of the series hasn't changed from v5. Here are pointers for your convenience: 2/5 http://www.redhat.com/archives/libvir-list/2015-July/msg00676.html 3/5 http://www.redhat.com/archives/libvir-list/2015-July/msg00680.html 4/5 http://www.redhat.com/archives/libvir-list/2015-July/msg00681.html 5/5 http://www.redhat.com/archives/libvir-list/2015-July/msg00682.html Cheers. Andrea Bolognani (3): tests: Add subcores-default nodeinfo test tests: Add subcores-partial nodeinfo test tests: Add subcores-invalid nodeinfo test Shivaprasad G Bhat (2): nodeinfo: Fix output on PPC64 KVM hosts tests: Prepare for subcore tests src/libvirt_private.syms | 1 + src/nodeinfo.c | 144 ++++++++++++++++++++- src/nodeinfo.h | 1 + tests/Makefile.am | 6 + [...] tests/nodeinfomock.c | 35 +++++ tests/nodeinfotest.c | 5 +- 1348 files changed, 2122 insertions(+), 6 deletions(-) -- 2.4.3

1 1

Re: [libvirt] [PATCH V3 2/3] virtio-blk: fail get_features when both scsi and 1.0 were set
by Daniel P. Berrange 22 Jul '15

22 Jul '15

On Wed, Jul 22, 2015 at 01:40:25PM +0200, Paolo Bonzini wrote: > > > On 22/07/2015 12:19, Michael S. Tsirkin wrote: > > > > SCSI passthrough was no longer supported in virtio 1.0, so this patch > > > > fail the get_features() when both 1.0 and scsi is set. And also only > > > > advertise VIRTIO_BLK_F_SCSI for legacy virtio-blk device. > > > > > > Why is SCSI passthrough support not available in virtio 1.0 ? This > > > will cause a regression for any users of that as & when QEMU changes > > > to use virtio 1.0 by default. Can we not fix this regression instead. > > > > If we wanted to, we might be able to fix this but not for 2.4: we'd have > > to extend the spec and guest drivers, in some way TBD. > > > > Paolo would be best placed to answer whether this feature is desirable > > in the future, I think the argument made when the spec was written was that > > the feature is not widely used, and virtio scsi is available as > > a replacement for people who need it. > > No, the feature is not desirable in the future. There is no reason > really not to use virtio-scsi passthrough instead, since virtio-scsi has > been out for about 3 years now and is stable. > > In addition, the implementation would either not be compatible with > virtio 0.9, or would be different from everything else in the spec > because it requires a particular framing for the buffers. IIUC, the SCSI passthrough feature for virtio-blk is enabled by setting the 'scsi=on' property on the virtio-blk device, which is exposed by libvirt with XML: <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/sda'/> <target dev='vda' bus='virtio'/> </disk> (For use with virtio-scsi you'd just change the <target> element) So if the guest is using virtio-1.0, then this will now fail to boot, or cause an error from monitor hotplug. This is not too bad, but I'm just wondering if there's anything else we ought to think about doing in libvirt in this situation. Normally we'd try to detect unsupported things upfront so we can report VIR_ERR_CONFIG_UNSUPPORTED, instead of the generic error code VIR_ERR_INTERNAL_ERROR, but perhaps this is sufficiently niche to not worry about it and its fine to just delegate error reporting to QEMU ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 2

[libvirt] [PATCH glib] README: formally document intended platform support targets
by Daniel P. Berrange 22 Jul '15

22 Jul '15

Give users an indication of what distro platforms the project intends to be buildable on. This policy will be used to decide when it is appropriate to increase the minimum required versions of external dependancies. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- README | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/README b/README index 3108e3c..3547089 100644 --- a/README +++ b/README @@ -26,18 +26,59 @@ The latest official releases can be found at: NB: at this time, libvirt-glib is *NOT* considered API/ABI stable. Future releases may still include API/ABI incompatible changes. -Dependencies -============ - -- Required: - - glib-2.0 - - gobject-2.0 - - libxml-2.0 - - libvirt - -- Optional: - - gobject-introspection - - Vala (build-time only) +Dependencies / supported platforms +================================== + +The libvirt-glib projects attempts to be moderately conservative +about updating the minimum required versions of external package +dependencies, to strike a balance between enabling use of new +features while minimizing inconvenience for downstream developers +on distro platforms with specific shipped version. + +There are commonly two classes of Linux distro - short lifetime +(Fedora, Ubuntu non-LTS, etc) and extended lifetime (RHEL, CentOS, +Debian, Ubuntu LTS). Based on this classification, the libvirt-glib +project will generally aim to ensure build support for + + - Most recent 2 releases of short lifetime distros + - Most recent major release of extended lifetime distros, + with most recent 2 minor updates + +The project will consider RHEL, Fedora, Ubuntu LTS, Ubuntu, OpenSUSE +and SUSE (SLES/SLED) distros to be a representative subset of distros +when determining min required versions of external deps, as other distros +of similar release vintage will typically have similar versions. In the +case of Debian, the project may at times choose to require use of an +update from the backports repository. + +As an example, as of July 1st 2015 this policy would imply that the +following distros are officially targetted as buildable platforms: + + - RHEL: 7.1, 7.2 + - Fedora: 21, 22 + - Ubuntu LTS: 14.04 (Trusty) + - Ubuntu: 14.10 (Utopic), 15.04 (Vivid) + - Suse: 12.0 + - OpenSUSE: 13.1, 13.2 + - Debian: 8.0 (Jessie) + +At any time, it may be possible to build on versions of distros +that are older than those implied by this policy, but the project +will not guarantee this remains the case in future releases. The +min required package versions of external dependancies may be +raised in future releases based on this distro build target policy. + +The packages required to build libvirt-glib are + + - glib-2.0 + - gobject-2.0 + - libxml-2.0 + - libvirt + +Functionality is optionally enhanced by the following packages: + + - gobject-introspection + - Vala (build-time only) Patches sumissions ================== -- 2.4.3

2 2

[libvirt] [PATCH glib] configure.ac: update min required versions
by Daniel P. Berrange 22 Jul '15

22 Jul '15

Based on the distro target policy we have the following min versions in various distros libvirt glib2 gobject-introspection RHEL 7.0: 1.1.1 2.36.3 1.36.0 Fedora 21: 1.2.9 2.42.1 1.42.0 Ubuntu 14.10: 1.2.8 2.42.0 1.41.0 Ubuntu LTS 14.04: 1.2.2 2.40.0 1.40.0 Suse 12.0: 1.2.5 2.38.2 1.38.0 OpenSUSE 13.1: 1.1.2 2.38.2 1.38.0 Debian 8: 1.2.9 2.42.0 1.42.0 Which means we can reasonably depend on libvirt >= 1.1.1 glib2 >= 2.36.3 gobject-introspection >= 1.36.0 This allows us to remove the conditional building of unit tests --- configure.ac | 15 ++++----------- tests/Makefile.am | 2 -- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index d9b4665..b473d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,14 +9,11 @@ AC_CANONICAL_HOST AM_SILENT_RULES([yes]) -LIBVIRT_REQUIRED=0.10.2 +LIBVIRT_REQUIRED=1.1.1 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file -GLIB2_REQUIRED=2.36.0 +GLIB2_REQUIRED=2.36.3 AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file -GLIB2_TEST_REQUIRED=2.38.0 -GOBJECT2_REQUIRED=2.10.0 -GIO_REQUIRED=2.10.0 -GOBJECT_INTROSPECTION_REQUIRED=0.10.8 +GOBJECT_INTROSPECTION_REQUIRED=1.36.0 LIBXML2_REQUIRED=2.0.0 LIBVIRT_GLIB_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` @@ -102,16 +99,12 @@ AC_CHECK_LIB([virt], [virNetworkGetDHCPLeases], [AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?])]) enable_tests=no -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED, - [enable_tests=yes], - [PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)]) +PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) -AM_CONDITIONAL([ENABLE_TESTS], [test "$enable_tests" = "yes"]) - LIBVIRT_GLIB_GETTEXT dnl Should be in m4/virt-gettext.m4 but intltoolize is too dnl dumb to find it there diff --git a/tests/Makefile.am b/tests/Makefile.am index 3f4ef6c..396092a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,3 @@ -if ENABLE_TESTS include $(top_srcdir)/build-aux/glib-tap.mk @@ -22,4 +21,3 @@ test_programs = test-gconfig test-events EXTRA_DIST += \ xml \ $(NULL) -endif -- 2.4.3

1 1

[libvirt] [libvirt-glib 0/4] gconfig: Leak fixes and small cleanup
by Christophe Fergeau 22 Jul '15

22 Jul '15

Hey, This patch series makes tests/test-gconfig valgrind-clean, and refactors two setters in GVirConfigDomainVideo to make them use the helpers provided by GVirConfigObject. Christophe

2 8

[libvirt] [libvirt-glib] examples: Don't leak mainloop in conn-test.c
by Christophe Fergeau 22 Jul '15

22 Jul '15

The program exits right after this, so it's no big deal, but this gives us a clean valgrind --leak-check=full output. --- examples/conn-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index adc6434..ac5880a 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -90,7 +90,7 @@ int main(int argc, char **argv) gvir_connection_open_async(conn, NULL, do_connection_open, loop); g_main_loop_run(loop); - + g_main_loop_unref(loop); return 0; } -- 2.4.3

1 1

[libvirt] [PATCH glib] Remove dep on libvirt 1.2.6
by Daniel P. Berrange 22 Jul '15

22 Jul '15

Going back on what I said a few hours ago.... On closer inspection, I re-discovered that we have already taken the approach of conditionally compiling code in libvirt-gobject to avoid increasing the min libvirt. So given this, I would like to avoid increasing the min required libvirt in the release we're about to do today for benefit of GNOME boxes. I think we can still have a valid discussion about increasing the min libvirt after this release is done, since I think that 0.10.2 is really far too old. It is based on RHEL-6 vintage libvirt and that's not really useful due to lack of gobject introspection. So to clarify, I think we should set a clear policy on what platforms we're going to target going forward. This will let us make an easy & clear decision about when a patch needs to use the conditional compilation approach. Daniel P. Berrange (1): Make use of DHCP API conditionally compiled configure.ac | 6 ++- .../libvirt-gobject-network-dhcp-lease.c | 50 ++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-network.c | 12 ++++++ 3 files changed, 67 insertions(+), 1 deletion(-) -- 2.4.3

3 7

[libvirt] [RFC] domain xml validation for source elements
by Boris Fiuczynski 22 Jul '15

22 Jul '15

I ran into a problem that was caused by a missing leading slash (/) in the value of the file attribute of a disks source element. Defining the domain worked without a problem. Editing the domain and trying to save it resulted in a very generic error message: error: XML document failed to validate against schema: Unable to validate doc against /usr/share/libvirt/schemas/domain.rng Extra element devices in interleave Element domain failed to validate content Failed. Try again? [y,n,i,f,?]: It took me some time to find out that the schema defines in absFilePath a leading slash as required for a fully qualified file path but the C code parsing does not require/validate it. <define name="diskSourceFile"> ... <interleave> <optional> <element name="source"> <optional> <attribute name="file"> <ref name="absFilePath"/> </attribute> </optional> ... </element> </optional> </interleave> </define> <define name="absFilePath"> <data type="string"> <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,:]+</param> </data> </define> I tried to fix the behavior by implementing additional validation code in method virDomainDiskSourceParse checking for the leading slash on the absolute file path. This resulted in breaking the VMware tests (xml2vmxtest), e.g. 8) VMware XML-2-VMX cdrom-scsi-file -> cdrom-scsi-file When looking at the related test data I found: <disk type='file' device='cdrom'> <source file='[testing] isos/cdrom.iso'/> <target dev='sda' bus='scsi'/> </disk> Besides the fact that the file path string also contains the characters space, opening and closing square brackets which are not specified as valid characters the file path string does not have a leading slash but instead some kind of 'datastore' specific name. What is the way to approach this since I am not a VMware user? 1) Change the schema to include the missing characters and removing the requirement for the leading slash and include additional schema aligned validation in the parsing code (method virDomainDiskSourceParse) or 2) fix the VMware tests to use absolute paths only and include additional schema aligned validation in the parsing code (method virDomainDiskSourceParse). -- Mit freundlichen Grüßen/Kind regards Boris Fiuczynski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martina Köderitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 1

[libvirt] Continuation of Admin APIs
by Martin Kletzander 22 Jul '15

22 Jul '15

So now that we have the Admin API backend merged in, the code is prepared to have new APIs added in. There are many things to be added, but we should start out slowly with the most desired ones. I'll try to outline what I have in my mind so the discussion can sprout into existence. As Erik (Cc'd) expressed his interest in this, I'm just summarizing my ideas here, feel free to trash them if you feel like your idea is better. Apart from adding new APIs, we also need to split virsh to create virt-admin. I've hit a few bumps on that and Erik started looking at that either, but that's outside of the scope of this email. * What to start with ** Changing debugging settings This is something that makes sense and should be easy to do. I imagine something along the lines of virAdmSetDebug() being able to setup log_level, log_filters, log_outputs (and maybe log_buffer_size). The question is whether we want these to be three (or four) parameters (since that number in unlikely to change) or typed parameters. Even though I like the extensibility of typed parameters, I'd probably vote for the former. Mainly because this might become syntactic sugar to some heavier API (see below). There might be flags for persisting such settings, but that's highly debatable and might be also done later on. The only situation in which we might not want this API is if there is another one that is able to stream debug logs using virStream. There must be some "double-buffering" done for this since we would ran into bunch of problems. ** Reporting connection/client information This is a harder one to design since there is not primary key associated with each client. We'll need to come up with some, maybe combined one (based on more information, e.g. socket info, connection time). And if there's nothing better, then I guess associating a ID with each new connection (be it uint64 or UUID) will have to do. Then we have to come up with how to represent the client data so it's scalable. We might need to resort to something else than a structure, for binary extensibility. ** Forcibly disconnecting a client I haven't checked this thoroughly, but I can certainly see the problem where setting client->wantClose = true might just not be enough. If all non-workers are occupied with blocking API, disconnecting clients won't help with making the server accessible again. And that leads me to another one. ** Changing worker pool parameters In case the (maximum) number of workers needs to be changed, it should be possible by this API. However, there's yet again a question whether this is needed if we'll have a bigger gun for all daemon settings. That's described in the next section. * Future ideas (for consideration) ** Changing any settings for the libvirt daemon. I had an idea that we should have a "universal" API for changing any settings that comes from config files. The API that would implement this would have a string parameter (or list of strings) that would say what setting(s) to change, similarly to augtool. So let's say instead of: $ augtool -s set /files/etc/libvirt/libvirtd.conf/max_workers 10 one would call: virAdmSetConfig("libvirtd.conf/max_workers", "10", ...); Good thing about this is that it is highly scalable (even to qemu.conf). Bad thing is that we need to be able to say whether there is a setting that we don't yet support (return error_unsupported) and also we'd need to rework the configuration module to be able to do such thing and have a function to call for each change. Having this would render changing max_workers, log_level etc. obsolete (although I feel like changing debug parameters still deserves its own API function). ** Reloading the server's TLS certificates? This was requested by Lee (Cc'd) in a reply to one of the PoC series. It is something that I feel like we really want as well, but I haven't yet put much thought into it. That's all from me now. I won't have much access to my mail in couple of following days, so I'll be slower to respond, even slower than my usual slow. Have a nice day, Martin

2 2

[libvirt] [PATCH] qemu: fix the error cover issue in SetMemoryParameters
by Luyao Huang 22 Jul '15

22 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1245476 We won't return the errno after commit 0d7f45ae, and the more clearly error will be set in the code in vircgroup*. Also We will always report error "Operation not permitted", because the return is -1. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9dbe635..3130fe3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9809,12 +9809,8 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, #define QEMU_SET_MEM_PARAMETER(FUNC, VALUE) \ if (set_ ## VALUE) { \ if (flags & VIR_DOMAIN_AFFECT_LIVE) { \ - if ((rc = FUNC(priv->cgroup, VALUE)) < 0) { \ - virReportSystemError(-rc, _("unable to set memory %s tunable"), \ - #VALUE); \ - \ - goto endjob; \ - } \ + if ((rc = FUNC(priv->cgroup, VALUE)) < 0) \ + goto endjob; \ vm->def->mem.VALUE = VALUE; \ } \ \ -- 1.8.3.1

3 2

[libvirt] [PATCH v2 00/10] nodeinfo: Various cleanups
by Andrea Bolognani 22 Jul '15

22 Jul '15

This should take care of Peter's remarks, except the ones that I've addressed separately. Andrea Bolognani (10): nodeinfo: Introduce linuxGetCPUGlobalPath() nodeinfo: Introduce linuxGetCPUOnlinePath() nodeinfo: Rename linuxParseCPUmax() to linuxParseCPUCount() nodeinfo: Add old kernel compatibility to nodeGetPresentCPUBitmap() nodeinfo: Remove out parameter from nodeGetCPUBitmap() nodeinfo: Rename nodeGetCPUBitmap() to nodeGetOnlineCPUBitmap() nodeinfo: Phase out cpu_set_t usage nodeinfo: Use nodeGetOnlineCPUBitmap() when parsing node nodeinfo: Use a bitmap to keep track of node CPUs nodeinfo: Calculate present and online CPUs only once src/libvirt_private.syms | 2 +- src/nodeinfo.c | 214 +++++++++++++++++++++++++++++------------------ src/nodeinfo.h | 2 +- 3 files changed, 136 insertions(+), 82 deletions(-) -- 2.4.3

2 19

[libvirt] [PATCH v4] qemu: Use heads parameter for QXL driver
by Frediano Ziglio 22 Jul '15

22 Jul '15

Allows to specify maximum number of head to QXL driver. Actually can be a compatiblity problem as heads in the XML configuration was set by default to '1'. Signed-off-by: Frediano Ziglio <fziglio(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++ .../qemuxml2argv-video-qxl-device-max-outputs.args | 7 ++++++ .../qemuxml2argv-video-qxl-device-max-outputs.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 6 files changed, 47 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml Changes from v4: - rebased on new master; - add test case to qemuxml2argvtest. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d8cb32d..0769316 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -288,6 +288,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vhost-user-multiqueue", /* 190 */ "migration-event", + "qxl-vga.max_outputs", ); @@ -1651,6 +1652,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, + { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS }, }; struct virQEMUCapsObjectTypeProps { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f77bd06..88116af 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -231,6 +231,7 @@ typedef enum { QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ + QEMU_CAPS_QXL_VGA_MAX_OUTPUTS = 192, /* qxl-vga.max_outputs */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 42906a8..34a0574 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5684,6 +5684,11 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts mebibytes for vgamem_mb. */ virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS) && + video->heads > 0) { + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); + } } else if (video->vram && ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args new file mode 100644 index 0000000..bb477a9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /var/lib/libvirt/images/QEMUGuest1 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ +,max_outputs=3,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0\ +,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml new file mode 100644 index 0000000..9426efc --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='qxl' heads='3'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f9b30d9..4cd6892 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1441,6 +1441,9 @@ mymain(void) DO_TEST("video-qxl-device-vgamem", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM); + DO_TEST("video-qxl-device-max-outputs", QEMU_CAPS_DEVICE, + QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS); DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL); DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); -- 2.1.0

6 18

[libvirt] [PATCH] Revert "qemu: Use heads parameter for QXL driver"
by Martin Kletzander 22 Jul '15

22 Jul '15

This reverts commit 7b401c3bdacdf8367a0070e625d73eafb802045d. Until libvirt is able to differentiate whether heads='1' is just a leftover from previous libvirt or whether that's added by user on purpose and also whether the domain was started with the support for qxl's max_outputs, we cannot incorporate this patch into the tree due to compatibility reasons. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- The discussion about this can be found in this thread: https://www.redhat.com/archives/libvir-list/2015-July/msg00808.html src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 5 ---- .../qemuxml2argv-video-qxl-device-max-outputs.args | 7 ------ .../qemuxml2argv-video-qxl-device-max-outputs.xml | 29 ---------------------- tests/qemuxml2argvtest.c | 3 --- 6 files changed, 47 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0769316fe999..d8cb32d77761 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -288,7 +288,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vhost-user-multiqueue", /* 190 */ "migration-event", - "qxl-vga.max_outputs", ); @@ -1652,7 +1651,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, - { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS }, }; struct virQEMUCapsObjectTypeProps { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 88116afc4dab..f77bd06ec38d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -231,7 +231,6 @@ typedef enum { QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ - QEMU_CAPS_QXL_VGA_MAX_OUTPUTS = 192, /* qxl-vga.max_outputs */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 34a0574be294..42906a898b36 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5684,11 +5684,6 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts mebibytes for vgamem_mb. */ virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); } - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS) && - video->heads > 0) { - virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); - } } else if (video->vram && ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args deleted file mode 100644 index bb477a9b4a5f..000000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args +++ /dev/null @@ -1,7 +0,0 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ -,max_outputs=3,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0\ -,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml deleted file mode 100644 index 9426efc917d4..000000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml +++ /dev/null @@ -1,29 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source file='/var/lib/libvirt/images/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <video> - <model type='qxl' heads='3'/> - </video> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4cd6892fe0de..f9b30d978171 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1441,9 +1441,6 @@ mymain(void) DO_TEST("video-qxl-device-vgamem", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM); - DO_TEST("video-qxl-device-max-outputs", QEMU_CAPS_DEVICE, - QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS); DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL); DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); -- 2.4.6

2 2

[libvirt] [PATCH] cgroup: Drop resource partition from virSystemdMakeScopeName
by Peter Krempa 22 Jul '15

22 Jul '15

The scope name, even according to our docs is "machine-$DRIVER\x2d$VMNAME.scope" virSystemdMakeScopeName would use the resource partition name instead of "machine-" if it was specified thus creating invalid scope paths. This makes libvirt drop cgroups for a VM that uses custom resource partition upon reconnecting since the detected scope name would not match the expected name generated by virSystemdMakeScopeName. The error is exposed by the following log entry: debug : virCgroupValidateMachineGroup:302 : Name 'machine-qemu\x2dtestvm.scope' for controller 'cpu' does not match 'testvm', 'testvm.libvirt-qemu' or 'machine-test-qemu\x2dtestvm.scope' for a "/machine/test" resource and "testvm" vm. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1238570 --- src/lxc/lxc_process.c | 6 ------ src/qemu/qemu_cgroup.c | 3 --- src/util/vircgroup.c | 11 ++--------- src/util/vircgroup.h | 1 - src/util/virsystemd.c | 9 ++------- src/util/virsystemd.h | 3 +-- tests/virsystemdtest.c | 20 +++++++------------- 7 files changed, 12 insertions(+), 41 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2bdce3b..87ee484 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1319,9 +1319,6 @@ int virLXCProcessStart(virConnectPtr conn, * more reliable way to kill everything off if something * goes wrong from here onwards ... */ if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - vm->def->resource ? - vm->def->resource->partition : - NULL, -1, &priv->cgroup) < 0) goto cleanup; @@ -1505,9 +1502,6 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, goto error; if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - vm->def->resource ? - vm->def->resource->partition : - NULL, -1, &priv->cgroup) < 0) goto error; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 8ed74ee..ab21e12 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -855,9 +855,6 @@ qemuConnectCgroup(virQEMUDriverPtr driver, if (virCgroupNewDetectMachine(vm->def->name, "qemu", vm->pid, - vm->def->resource ? - vm->def->resource->partition : - NULL, cfg->cgroupControllers, &priv->cgroup) < 0) goto cleanup; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0ef2d29..0599ba5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -243,7 +243,6 @@ static bool virCgroupValidateMachineGroup(virCgroupPtr group, const char *name, const char *drivername, - const char *partition, bool stripEmulatorSuffix) { size_t i; @@ -258,10 +257,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (virCgroupPartitionEscape(&partname) < 0) goto cleanup; - if (!partition) - partition = "/machine"; - - if (!(scopename = virSystemdMakeScopeName(name, drivername, partition))) + if (!(scopename = virSystemdMakeScopeName(name, drivername))) goto cleanup; if (virCgroupPartitionEscape(&scopename) < 0) @@ -1498,7 +1494,6 @@ int virCgroupNewDetectMachine(const char *name, const char *drivername, pid_t pid, - const char *partition, int controllers, virCgroupPtr *group) { @@ -1508,8 +1503,7 @@ virCgroupNewDetectMachine(const char *name, return -1; } - if (!virCgroupValidateMachineGroup(*group, name, drivername, partition, - true)) { + if (!virCgroupValidateMachineGroup(*group, name, drivername, true)) { VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'", name, drivername); virCgroupFree(group); @@ -4047,7 +4041,6 @@ int virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, const char *drivername ATTRIBUTE_UNUSED, pid_t pid ATTRIBUTE_UNUSED, - const char *partition ATTRIBUTE_UNUSED, int controllers ATTRIBUTE_UNUSED, virCgroupPtr *group ATTRIBUTE_UNUSED) { diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index e75c522..675a185 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -92,7 +92,6 @@ int virCgroupNewDetect(pid_t pid, int virCgroupNewDetectMachine(const char *name, const char *drivername, pid_t pid, - const char *partition, int controllers, virCgroupPtr *group); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 8cedf8d..54c409d 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -80,16 +80,11 @@ static void virSystemdEscapeName(virBufferPtr buf, char *virSystemdMakeScopeName(const char *name, - const char *drivername, - const char *partition) + const char *drivername) { virBuffer buf = VIR_BUFFER_INITIALIZER; - if (*partition == '/') - partition++; - - virSystemdEscapeName(&buf, partition); - virBufferAddChar(&buf, '-'); + virBufferAddLit(&buf, "machine-"); virSystemdEscapeName(&buf, drivername); virBufferAddLit(&buf, "\\x2d"); virSystemdEscapeName(&buf, name); diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7a29dba..8af2169 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -25,8 +25,7 @@ # include "internal.h" char *virSystemdMakeScopeName(const char *name, - const char *drivername, - const char *slicename); + const char *drivername); char *virSystemdMakeSliceName(const char *partition); char *virSystemdMakeMachineName(const char *name, diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 261c4cc..d0b9335 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -340,7 +340,6 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) struct testScopeData { const char *name; - const char *partition; const char *expected; }; @@ -351,9 +350,7 @@ testScopeName(const void *opaque) int ret = -1; char *actual = NULL; - if (!(actual = virSystemdMakeScopeName(data->name, - "lxc", - data->partition))) + if (!(actual = virSystemdMakeScopeName(data->name, "lxc"))) goto cleanup; if (STRNEQ(actual, data->expected)) { @@ -472,22 +469,19 @@ mymain(void) if (virtTestRun("Test create with network ", testCreateNetwork, NULL) < 0) ret = -1; -# define TEST_SCOPE(name, partition, unitname) \ +# define TEST_SCOPE(name, unitname) \ do { \ struct testScopeData data = { \ - name, partition, unitname \ + name, unitname \ }; \ if (virtTestRun("Test scopename", testScopeName, &data) < 0) \ ret = -1; \ } while (0) - TEST_SCOPE("demo", "/machine", "machine-lxc\\x2ddemo.scope"); - TEST_SCOPE("demo-name", "/machine", "machine-lxc\\x2ddemo\\x2dname.scope"); - TEST_SCOPE("demo!name", "/machine", "machine-lxc\\x2ddemo\\x21name.scope"); - TEST_SCOPE(".demo", "/machine", "machine-lxc\\x2d\\x2edemo.scope"); - TEST_SCOPE("demo", "/machine/eng-dept", "machine-eng\\x2ddept-lxc\\x2ddemo.scope"); - TEST_SCOPE("demo", "/machine/eng-dept/testing!stuff", - "machine-eng\\x2ddept-testing\\x21stuff-lxc\\x2ddemo.scope"); + TEST_SCOPE("demo", "machine-lxc\\x2ddemo.scope"); + TEST_SCOPE("demo-name", "machine-lxc\\x2ddemo\\x2dname.scope"); + TEST_SCOPE("demo!name", "machine-lxc\\x2ddemo\\x21name.scope"); + TEST_SCOPE(".demo", "machine-lxc\\x2d\\x2edemo.scope"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.4.5

2 4

[libvirt] [PATCH] configure: clarify rationale for checking pkcheck
by Daniel P. Berrange 22 Jul '15

22 Jul '15

We don't need pkcheck binary, but we must detect it in order to see if we're preferring polkit-1 over polkit-0 when both are installed. We should also check $with_dbus to see if we have dbus-devel available, as that's required to talk to polkit-1. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 70b3ef3..db0ccd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1339,15 +1339,28 @@ AC_ARG_WITH([polkit], with_polkit0=no with_polkit1=no if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then - dnl Check for new polkit first - just a binary + dnl Check for new polkit first. We directly talk over DBus + dnl but we use existance of pkcheck binary as a sign that + dnl we should prefer polkit-1 over polkit-0, so we check + dnl for it even though we don't ultimately use it AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH]) if test "x$PKCHECK_PATH" != "x" ; then - AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, - [use PolicyKit for UNIX socket access checks]) - AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1, - [use PolicyKit for UNIX socket access checks]) - with_polkit="yes" - with_polkit1="yes" + dnl Found pkcheck, so ensure dbus-devel is present + if test "x$with_dbus" = "xyes" ; then + AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, + [use PolicyKit for UNIX socket access checks]) + AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1, + [use PolicyKit for UNIX socket access checks]) + with_polkit="yes" + with_polkit1="yes" + else + if test "x$with_polkit" = "xcheck" ; then + with_polkit=no + else + AC_MSG_ERROR( + [You must install dbus to compile libvirt with polkit-1]) + fi + fi else dnl Check for old polkit second - library + binary PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED, -- 2.4.3

2 1

[libvirt] [PATCH] spec: Fix polkit dep on F23
by Cole Robinson 22 Jul '15

22 Jul '15

As of fedora polkit-0.113-2, polkit-devel only pulls in polkit-libs, not full polkit, but we need the latter for pkcheck otherwise our configure test fails. --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0adf55e..40d2ccb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -531,6 +531,8 @@ BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 +# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck +BuildRequires: polkit >= 0.112 BuildRequires: polkit-devel >= 0.112 %else %if 0%{?fedora} || 0%{?rhel} >= 6 -- 2.4.3

3 5

[libvirt] ANNOUNCE: libvirt-glib version 0.2.2 released
by Daniel P. Berrange 22 Jul '15

22 Jul '15

I am pleased to announce that a new release of the libvirt-glib package, version 0.2.2, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) Changes in this release: - Add API for getting interface MAC address - Simplify implementation of object listing APIs - Fix memory leaks of virConnect objects - Port to use GTask instead of GSimpleAsyncResult - Add API to get list of physical network interfaces - Add API to get list of virtual networks - Add API to get DHCP address of virtual networks - Avoid overwriting filesystem type when setting format - Include XML data for tests in dist - Add support for UNIX chardev sources - Fix test linking on platforms with strict linker deps - Add ability to set video ram + vgamem libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not currently guaranteeing that libvirt-glib libraries are permanently API/ABI stable. That said we do not expect to break the API/ABI for the forseeable future and will always strive avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] ANNOUNCE: libguestfs 1.30 released
by Richard W.M. Jones 22 Jul '15

22 Jul '15

I'm pleased to announce libguestfs 1.30, a library and set of tools for accessing and modifying virtual machine disk images. This release took 9 months of work by a considerable number of people, and has many new features (see release notes below). You can get libguestfs 1.30 here: Main website: http://libguestfs.org/ Source: http://libguestfs.org/download/1.30-stable/ You will also need latest supermin from here: http://libguestfs.org/download/supermin/ Fedora 22+: http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 It will appear as an update for F22/F23 in about a week. Debian/experimental coming soon, see: https://packages.debian.org/experimental/libguestfs0 [ From http://libguestfs.org/guestfs-release-notes.1.html ] NAME guestfs-release-notes - libguestfs Release Notes RELEASE NOTES FOR LIBGUESTFS 1.30 These release notes only cover the differences from the previous stable/dev branch split (1.28.0). For detailed changelogs, please see the git repository, or the ChangeLog file distributed in the tarball. New features New tools virt-dib(1) is a secure and safe alternative to the OpenStack "diskimage-builder" tool. It is compatible with diskimage-builder elements. (Pino Toscano) virt-get-kernel(1) extracts the kernel and ramdisk from a disk image. Previously this functionality was part of virt-builder(1), but the new tool is more featureful. (Pino Toscano) New features in existing tools virt-v2v(1) -i ova mode can now read a wider range of OVA files, and also unpacked files (directories). virt-v2v now securely passes options to curl, so passwords, cookies and so on cannot be seen by users with shell access on the same machine. virt-v2v has a new --password-file option to allow you to securely pass in a password, and to avoid an interactive prompt. virt-v2v disables Windows autoreboot, making debugging conversion failures on Windows easier. virt-v2v now comes with an extensive external test suite. See virt-v2v-test-harness(1). virt-v2v allows virtio drivers to come from any location (Roman Kagan), and drivers can be read directly from the virtio ISO. virt-v2v supports conversion of Windows ≥ 8. Note this is experimental, and possibly broken. Use with caution. virt-v2v can now convert UEFI guests. virt-p2v(1) adds a network configuration dialog. virt-p2v now has p2v.pre, p2v.post and p2v.fail triggers, allowing arbitrary scripts for preparing the host for conversion and tidying up post-conversion. virt-p2v now uses the more advanced metacity window manager (instead of matchbox). virt-sysprep(1) will remove /var/spool/mail/username for non-root accounts (Hu Tao). virt-customize(1), virt-builder(1) and virt-sysprep have the following new options: --commands-from-file allow long lists of commands to be read from a file instead of from the command line (Pino Toscano) --copy copy files inside the guest (Maros Zatko) --copy-in copy host files recursively into the guest (Pino Toscano) --move move files inside the guest (Maros Zatko) --ssh-inject inject SSH keys into a guest (Pino Toscano) --sm-attach --sm-credentials --sm-register --sm-remove --sm-unregister register and unregister a guest from subscription-manager (Pino Toscano) --touch touch a file in the guest (Pino Toscano) --truncate --truncate-recursive truncate files (Maros Zatko) Improvements to virt-customize firstboot support. In particular, Windows firstboot should work as well as Linux (Roman Kagan). virt-df(1) can now use PolicyKit, SASL and other authentication methods when getting the list of domains from libvirt. Improvements to guestfish bash completion (Pino Toscano). Bash completion now completes short options as well as long options (Pino Toscano). guestfish(1) now displays a command synopsis if the number of parameters given to a command is wrong (Hu Tao). virt-builder now supports Red Hat Enterprise Linux versions back to RHEL 3. virt-builder supports SUSE guests using zypper (Cédric Bosdonnat). Language bindings The Java bindings now include validated Javadoc, and other improvements (Pino Toscano). Multiple fixes and improvements to the PHP bindings (Pino Toscano). Inspection Inspection can now get icons from RHEL 7 and CentOS 7. /etc/favicon.png is now allowed to be a symbolic link. For RPM-based guests, inspection now returns RPM Epoch fields. Debian packages now have separate Epoch and Version fields (Nikos Skalkotos). OpenBSD detection added, FreeBSD and NetBSD added as separate "distros", and other BSD inspection improvements and bug fixes (Nikos Skalkotos). CoreOS detection added (Nikos Skalkotos). The package manager in Fedora ≥ 22 is dnf. ReactOS guests can be inspected (Maros Zatko). Add support for UEFI guests. Inspection now works when kernel modules are gzip or xz compressed (Pino Toscano). Inspection now recognizes ppc64 and ppc64le guests (Maros Zatko). Inspection lists the installed applications on Archlinux guests (Nikos Skalkotos). Architectures and platforms PPC64 (POWER7) and PPC64LE (POWER8) architectures are now much better supported, and should work out of the box. For aarch64, we use AAVMF (an open source UEFI implementation based on OVMF) if available to run the appliance. For armv7, we now use the -M virt machine type by default. There is better support for compiling on non-Linux platforms (Pino Toscano, Margaret Lewicka). Libguestfs should now work on MIPS 32 bit little endian ("mipsel"). I have not been able to try 64 bit or big endian. Security CVE-2014-8484 CVE-2014-8485 Libguestfs previously ran the strings(1) utility on untrusted files. Strings could parse BFD headers in an unsafe way, leading to possible arbitrary code execution. Libguestfs now runs strings with a flag to ensure it does not try to parse BFD headers. This could have led to exploitation of the libguestfs appliance, but since libguestfs further constrains the appliance through virtualization, SELinux and other techniques, it was unlikely to have caused any privilege escalation on the host. XPath injection in virt-v2v One possible XPath injection vulnerability was fixed in virt-v2v. This might have allowed a malicious guest which was being converted by virt-v2v to construct an arbitrary XPath expression which would have been evaluated on the host (by the libxml2 library linked to the virt-v2v binary). It is not clear what the effects of this might be. For further information, see upstream commit https://github.com/libguestfs/libguestfs/commit/6c6ce85f94c36803fe2db35a98d… Denial of service problems when using qemu-img info When using the American Fuzzy Lop fuzzer (afl-fuzz) on the qemu-img info command, Richard W.M. Jones found that certain files can cause the qemu-img program to use lots of memory and time (for example 6GB of heap and 14 seconds of CPU time on a fast Intel processor), and in some cases to crash. Since libguestfs may run qemu-img info on disk images to find out what they contain, this transitively could cause libguestfs to hang or consume lots of memory. Libguestfs was modified so that it uses resource limits to limit the space and time used by qemu-img info, to avoid this problem. If a malicious user tries to pass one of these disk images to libguestfs, qemu-img will crash and the crash is reported back to libguestfs callers as an error message. API New APIs guestfs_add_libvirt_dom This exposes a previously private API that allows you to pass a virDomainPtr object directly from libvirt to libguestfs. guestfs_blockdev_setra Adjust readahead parameter for devices. See blockdev --setra command. guestfs_btrfs_balance guestfs_btrfs_balance_cancel guestfs_btrfs_balance_pause guestfs_btrfs_balance_resume guestfs_btrfs_balance_status Balance support for Btrfs filesystems (Hu Tao). guestfs_btrfs_filesystem_defragment Filesystem defragmentation support for Btrfs filesystems (Hu Tao). guestfs_btrfs_image Create an image of a Btrfs filesystem (Chen Hanxiao) guestfs_btrfs_qgroup_assign guestfs_btrfs_qgroup_create guestfs_btrfs_qgroup_destroy guestfs_btrfs_qgroup_limit guestfs_btrfs_qgroup_remove guestfs_btrfs_qgroup_show guestfs_btrfs_quota_enable guestfs_btrfs_quota_rescan Quote support for Btrfs filesystems (Hu Tao). guestfs_btrfs_rescue_chunk_recover Scan and recover the chunk tree in Btrfs filesystems (Hu Tao). guestfs_btrfs_rescue_super_recover Restore superblocks in Btrfs filesystems (Hu Tao). guestfs_btrfs_replace Replace a device in a Btrfs filesystem (Cao Jin). guestfs_btrfs_scrub guestfs_btrfs_scrub_cancel guestfs_btrfs_scrub_resume guestfs_btrfs_scrub_status Scrub a Btrfs filesystem (Hu Tao). guestfs_btrfs_subvolume_get_default Get the default subvolume of a Btrfs filesystem (Hu Tao). guestfs_btrfs_subvolume_show List detailed information about the subvolume of a Btrfs filesystem (Hu Tao). guestfs_btrfstune_enable_extended_inode_refs guestfs_btrfstune_enable_skinny_metadata_extent_refs guestfs_btrfstune_seeding Various tuning parameters for Btrfs filesystems (Chen Hanxiao). guestfs_c_pointer Return the C pointer to the underlying guestfs_h *. This allows interworking of libguestfs bindings with bindings from other libraries. For further information see https://bugzilla.redhat.com/1075164 guestfs_copy_in guestfs_copy_out Flexible APIs for recursively copying directories of files between the host and guest filesystem. Previously these were available only as guestfish commands, but now any API users can call them (Pino Toscano). guestfs_part_get_gpt_guid guestfs_part_set_gpt_guid Get and set the GPT per-partition GUID. guestfs_part_get_mbr_part_type Get MBR partition type (Chen Hanxiao). guestfs_set_uuid_random Set the UUID of a filesystem to a randomly generated value; supported filesystems currently are ext2/3/4, XFS, Btrfs, and swap partitions. (Chen Hanxiao). Other API changes guestfs_disk_create can now use VMDK files as backing files. guestfs_btrfs_subvolume_snapshot takes extra optional parameters (all added by Hu Tao): ro for creating a read-only Btrfs snapshot qgroupid for adding the snapshot to a qgroup guestfs_btrfs_subvolume_create can also take the optional qgroupid parameter (Hu Tao). guestfs_set_uuid can set UUID of swap partitions, Btrfs (Hu Tao, Chen Hanxiao). guestfs_copy_device_to_file and guestfs_copy_file_to_file have a new optional append parameter, allowing you to append to the output file instead of truncating it. guestfs_mkfs has a new optional label parameter to set the initial label of the new filesystem (Pino Toscano). guestfs_set_label and guestfs_set_uuid now set ENOTSUP as errno when there is no implemented support for the filesystem of the specified mountable (Chen Hanxiao). Environment variables now let you write LIBGUESTFS_DEBUG=true, LIBGUESTFS_DEBUG=0 and so on. All guestfs_sfdisk* APIs have been deprecated. Because sfdisk(8) was rewritten, incompatibly, upstream, we don't recommend using these APIs in future code. Use the guestfs_part* APIs as replacements. APIs such as guestfs_download do not truncate /dev/stdout or /dev/stderr when writing to them, meaning that if you redirect stdout or stderr to a file, the file is no longer truncated. Build changes The daemon no longer uses its own separate copy of gnulib. Instead it shares a single copy with the library. OCaml .annot files are now created, so IDEs and editors like emacs and vi can browse OCaml types in the source code. Various fixes to allow different host/appliance architecture builds (Pino Toscano). Automake is now used directly to build all the OCaml programs, instead of ad hoc Makefile rules. One side effect of this is to enable warnings in all the C code used by OCaml programs. -fno-strict-overflow is used throughout the build to avoid dubious GCC optimizations. Multiple cleanups to support GCC 5. OCaml OUnit2 is needed to run some OCaml tests. Creating a statically linked libguestfs.a should work again. The src/api-support subdirectory and its scripts are no longer used. Instead we store in the generator/actions.ml when the API was added to libguestfs. Internationalization The translation service has changed from Transifex to Zanata. Many more translations are available now, for both library and tools messages and documentation. Internals In all OCaml tools, there are now common error, warning, info functions, and common way to set and get the --quiet, -x (trace) and -v (verbose) flags, and colour highlighting used consistently. COMPILE_REGEXP macros are used to simplify PCRE constructors and destructors. In the generator, Pointer arguments have finally been implemented. Internal identifiers no longer use double and triple underscores (eg. guestfs___program_name). These identifiers are invalid for C99 and C++ programs, although compilers would accept them. The daemon no longer parses guestfs_* options from /proc/cmdline. Instead it only takes ordinary command line options. The appliance init script turns /proc/cmdline into daemon command line options. The tests can now run the daemon as a "captive process", allowing it to be run directly on the host. The main advantage of this is we can run valgrind directly on the daemon during testing. Bugs fixed https://bugzilla.redhat.com/1239053 virt-v2v error reporting when grub.conf cannot be parsed by Augeas https://bugzilla.redhat.com/1238053 v2v:Duplicate disk target set when convert guest with cdrom attached https://bugzilla.redhat.com/1237869 Virtio drivers are not installed for windows 2008 guests by virt-v2v https://bugzilla.redhat.com/1234351 virt-v2v Support for Fedora virtio-win drivers https://bugzilla.redhat.com/1232192 Virt-v2v gives an error on a blank disk: part_get_parttype: unknown signature, of the output: BYT; https://bugzilla.redhat.com/1229385 virt-p2v in kernel command line mode should power off the machine after conversion https://bugzilla.redhat.com/1229340 virt-p2v no GUI mode appends \n to the final command line parameter https://bugzilla.redhat.com/1229305 virt-sysprep at cleanup deletes /var/spool/at/.SEQ which results in failing at https://bugzilla.redhat.com/1226794 "Doing conversion……" still shows after cancel the conversion from virt-p2v client https://bugzilla.redhat.com/1215042 Memory leak in virNetSocketNewConnectUNIX https://bugzilla.redhat.com/1213324 virt-v2v: warning: unknown guest operating system: windows windows 6.3 when converting win8,win8.1,win2012,win2012R2 to rhev https://bugzilla.redhat.com/1213247 virt tools should print the same format of version string https://bugzilla.redhat.com/1212808 RFE: virt-builder --touch https://bugzilla.redhat.com/1212807 virt-builder --selinux-relabel flag fails on cross-architecture builds https://bugzilla.redhat.com/1212680 RFE: virt-inspector xpath query should output a neat format of the query element https://bugzilla.redhat.com/1212152 virt-builder firstboot-command fails: File name too long https://bugzilla.redhat.com/1211996 virt-inspector gives incorrect arch (ppc64) for ppc64le guest https://bugzilla.redhat.com/1203817 RFE: virt-customize --move and --copy https://bugzilla.redhat.com/1201526 index-parser can't parse systemd mount files properly https://bugzilla.redhat.com/1196101 virt-builder --upload option doesn't work to a FAT partition https://bugzilla.redhat.com/1196100 virt-builder -x option on its own does not enable tracing https://bugzilla.redhat.com/1195204 `virt-builder` should create $HOME/.cache directory if it already doesn't exist https://bugzilla.redhat.com/1193237 Virt-builder fingerprint is required even when no check desired https://bugzilla.redhat.com/1189284 virt-resize should preserve GPT partition UUIDs, else EFI guests become unbootable https://bugzilla.redhat.com/1188866 Performance regression in virt-builder when uncompressing image https://bugzilla.redhat.com/1186800 virt-v2v should support gzip format ova as input https://bugzilla.redhat.com/1185561 virt-sparsify should ignore read-only LVs https://bugzilla.redhat.com/1182463 "mknod-b", "mknod-c", and "mkfifo" do not strip non-permissions bits from "mode" https://bugzilla.redhat.com/1176493 virt-v2v ignores sound device when convert xen guest to local kvm https://bugzilla.redhat.com/1175676 Typo error in 'help ping-daemon' https://bugzilla.redhat.com/1175196 "parse-environment" and "parse-environment-list" fail to parse "LIBGUESTFS_TRACE = 0" https://bugzilla.redhat.com/1175035 "is-blockdev"/"is-blockdev-opts" fail to detect "/dev/sda" https://bugzilla.redhat.com/1174280 RFE: Allow v2v conversion of Oracle Linux 5.8 VMware VM https://bugzilla.redhat.com/1174200 New virt-v2v failure: CURL: Error opening file: NSS: client certificate not found (nickname not specified): Invalid argument https://bugzilla.redhat.com/1174123 Graphics password disappear after conversion of virt-v2v https://bugzilla.redhat.com/1174073 The listen address for vnc is changed after conversion by virt-v2v https://bugzilla.redhat.com/1171666 inspection thinks EFI partition is a separate operating system https://bugzilla.redhat.com/1171130 virt-v2v conversion of RHEL 3 guest fails with: All of your loopback devices are in use https://bugzilla.redhat.com/1170685 Conversion of RHEL 4 guest fails: rpm -ql 1:kernel-utils-2.4-23.el4: virt-v2v: error: libguestfs error: command_lines: https://bugzilla.redhat.com/1170073 virt-v2v picks debug kernels over non-debug kernels when versions are equal https://bugzilla.redhat.com/1169045 virt-sparsify: libguestfs error: qemu-img info: 'virtual-size' is not representable as a 64 bit integer https://bugzilla.redhat.com/1169015 virt-resize --expand fails on ubuntu-14.04.img image (regression) https://bugzilla.redhat.com/1168144 warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server https://bugzilla.redhat.com/1167921 p2v: No Network Connection dialog https://bugzilla.redhat.com/1167774 virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed" https://bugzilla.redhat.com/1167623 Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v https://bugzilla.redhat.com/1167601 "Conversion was successful" pop out even virt-p2v fails https://bugzilla.redhat.com/1167302 virt-v2v: warning: ova hard disk has no parent controller when convert from a ova file https://bugzilla.redhat.com/1166618 virt-resize should give out the detail warning info to let customers know what's going wrong https://bugzilla.redhat.com/1165975 File "/boot/grub2/device.map" showing is not right after converting a rhel7 guest from esx server https://bugzilla.redhat.com/1165785 mount-loop command fails: mount failed: Unknown error -1 https://bugzilla.redhat.com/1165569 Disable "cancel conversion" button after virt-p2v conversion finished https://bugzilla.redhat.com/1165564 Provide Reboot/Shutdown button after virt-p2v https://bugzilla.redhat.com/1164853 Booting in qemu found no volume groups and failed checking the filesystems https://bugzilla.redhat.com/1164732 The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel https://bugzilla.redhat.com/1164697 typo errors in man pages https://bugzilla.redhat.com/1164619 Inspect-get-icon failed on RHEL7 guest https://bugzilla.redhat.com/1162966 xfs should also give a warning out to let customer know the limitation https://bugzilla.redhat.com/1161575 Failed to import guest with "rtl8139" nic to openstack server after converted by v2v https://bugzilla.redhat.com/1159651 virt-sysprep firstboot script is not deleted if it reboot a RHEL 7 guest https://bugzilla.redhat.com/1159258 esx win2008 32 bit guest fail to load after conversion because the firmware isn't ACPI compatible https://bugzilla.redhat.com/1159016 libvirt backend does not set RBD password https://bugzilla.redhat.com/1158526 Use password file instead of process interaction https://bugzilla.redhat.com/1157679 virt-p2v-make-disk should add firmwares https://bugzilla.redhat.com/1156449 libguestfs FTBFS on f21 ppc64le https://bugzilla.redhat.com/1156301 virt-inspector support adding a remote disk, but in its man page -a URI / --add URI is missing https://bugzilla.redhat.com/1155121 Virt-v2v will fail when using relative path for -i ova https://bugzilla.redhat.com/1153844 Redundancy whitespace at the end of directory name when use <TAB> to complete the directory name in guestfish with a xfs filesystem in guest https://bugzilla.redhat.com/1153589 virt-v2v will hang when converting esx guest before disk copy phase https://bugzilla.redhat.com/1152998 virt-v2v / qemu-img fails on ova image https://bugzilla.redhat.com/1151910 virt-ls should remove '/' in the output when specify the directory name as /etc/ https://bugzilla.redhat.com/1151900 Should also add a field for directory files when run virt-ls with --csv option https://bugzilla.redhat.com/1151033 virt-v2v conversions from VMware vCenter server run slowly https://bugzilla.redhat.com/1146832 virt-v2v fail to convert guest with disk type volume https://bugzilla.redhat.com/1146007 Input/output error during conversion of esx guest. https://bugzilla.redhat.com/1135585 [RFE] virt-builder should support copying in a directory/list of files https://bugzilla.redhat.com/1089566 [abrt] livecd-tools: kickstart.py:276:apply:IOError: [Errno 2] No such file or directory: '/run/media/jones/2tp001data/createlive/temp/imgcreate-_dX8Us/install_root/etc/rpm/macros.imgcreate' https://bugzilla.redhat.com/1079625 virt-sparsify fails if a btrfs filesystem contains readonly snapshots https://bugzilla.redhat.com/1075164 RFE: allow passing in a pre-opened libvirt connection from python https://bugzilla.redhat.com/912499 Security context on image file gets reset https://bugzilla.redhat.com/889082 [RFE] virt-v2v should check whether guest with same name exist on target first then transfer the disk https://bugzilla.redhat.com/855059 RFE: virt-p2v: display more information about network devices such as topology, bonding, etc. https://bugzilla.redhat.com/823758 p2v client should have largest number restrictions for CPU and Memory settings https://bugzilla.redhat.com/709327 hivex cannot read registry hives from ReactOS https://bugzilla.redhat.com/709326 virt-inspector cannot detect ReactOS https://bugzilla.redhat.com/119673 installation via NFS doesn't seem to work -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html

1 0

[libvirt] [PATCH 0/5] Additional SCSI generated device address checks
by John Ferlan 21 Jul '15

21 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1210587 These patches will resolve a couple issues with generation of the <address type='drive' .../> for a SCSI <disk> and <hostdev>. The <disk> generation algorithm 'assumes' that when presented with <target dev='sda'.../> that it can use controller=0 and unit=0 since sda would conceivably be the first device; however, a <hostdev> could attempt to assign itself to that address and it doesn't have a target device name, so it bypasses the virDomainDiskDefDstDuplicates checks that would normally 'catch' two <disk>'s attempting to use the same name. Likewise, if a <hostdev> occupies an <address> and we attempt to hotplug a <disk> without providing an address, the address generation could attempt to place the disk on the already existing host device. John Ferlan (5): conf: Enforce SCSI hostdev address type conf: Add 'bus' and 'target' to SCSI address conflict checks conf: Add SCSI hostdev check for disk drive address already in use conf: Refactor virDomainDiskDefParseXML to pass vmdef conf: Check for hostdev conflicts when assign default disk address docs/formatdomain.html.in | 4 +- src/conf/domain_conf.c | 115 ++++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 3 +- src/qemu/qemu_command.c | 4 +- src/vmx/vmx.c | 22 +++++---- src/vmx/vmx.h | 3 +- 6 files changed, 101 insertions(+), 50 deletions(-) -- 2.1.0

3 19

[libvirt] [PATCH 00/13] Improve virsh block job handling
by Peter Krempa 21 Jul '15

21 Jul '15

This series refactors the block job command code so that it is handled by separate functions rather than one mega-method. Additionally this series then fixes the routine for waiting for a block job. As it's perhaps obvious from the patches the API design for the block job APIs is rather unfortunate for users. This series contains a few patches that already were submitted and partially reviewed previously. Peter Krempa (13): virsh: blockjob: Extract block job info code into a separate function virsh: cmdBlockJob: Switch to declarative flag interlocking virsh: blockjob: Split out vshBlockJobSetSpeed from blockJobImpl virsh: block job: separate abort from blockJobImpl virsh: Split out block pull implementation from blockJobImpl virsh: Kill blockJobImpl by moving the final impl into cmdBlockCommit virsh: Refactor argument checking in cmdBlockCommit virsh: Refactor argument handling in cmdBlockCopy virsh: Refactor argument handling in cmdBlockPull qemu: Update state of block job to READY only if it actually is ready virsh: Refactor block job waiting in cmdBlockPull virsh: Refactor block job waiting in cmdBlockCommit virsh: Refactor block job waiting in cmdBlockCopy src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 + tools/virsh-domain.c | 962 ++++++++++++++++++++++++------------------- 4 files changed, 551 insertions(+), 429 deletions(-) -- 2.4.5

3 25

[libvirt] [libvirt-glib PATCHv5 1/7] gobject: Simplify gvir_connection_list*() implementations
by Zeeshan Ali (Khattak) 21 Jul '15

21 Jul '15

Make use of virConnectListAll* functions to avoid making 4 calls and hence avoid race conditions and complicated code. --- libvirt-gobject/libvirt-gobject-connection.c | 203 ++++----------------------- 1 file changed, 28 insertions(+), 175 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cf073a5..e088427 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -680,48 +680,6 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit(conn, signals[VIR_CONNECTION_CLOSED], 0); } -typedef gint (* CountFunction) (virConnectPtr vconn); -typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); - -static gchar ** fetch_list(virConnectPtr vconn, - const char *name, - CountFunction count_func, - ListFunction list_func, - GCancellable *cancellable, - gint *length, - GError **err) -{ - gchar **lst = NULL; - gint n = 0; - - if ((n = count_func(vconn)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count %s"), name); - goto error; - } - - if (n) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto error; - - lst = g_new0(gchar *, n); - if ((n = list_func(vconn, lst, n)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list %s %d"), name, n); - goto error; - } - } - - *length = n; - return lst; - -error: - g_free(lst); - return NULL; -} - /** * gvir_connection_fetch_domains: * @conn: a #GVirConnection @@ -733,14 +691,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *doms; - gchar **inactive = NULL; - gint ninactive = 0; - gint *active = NULL; - gint nactive = 0; + virDomainPtr *domains = NULL; + gint ndomains = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -761,81 +716,28 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, virConnectRef(vconn); g_mutex_unlock(priv->lock); - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count domains")); + ndomains = virConnectListAllDomains(vconn, &domains, 0); + if (ndomains < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of domains")); goto cleanup; } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gint, nactive); - if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list domains")); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Domains", - virConnectNumOfDefinedDomains, - virConnectListDefinedDomains, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - doms = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByID(vconn, active[i]); + for (i = 0 ; i < ndomains; i++) { GVirDomain *dom; - if (!vdom) - continue; dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, + "handle", domains[i], NULL)); - virDomainFree(vdom); - - g_hash_table_insert(doms, - (gpointer)gvir_domain_get_uuid(dom), - dom); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByName(vconn, inactive[i]); - GVirDomain *dom; - if (!vdom) - continue; - - dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, - NULL)); - virDomainFree(vdom); g_hash_table_insert(doms, (gpointer)gvir_domain_get_uuid(dom), @@ -852,10 +754,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, ret = TRUE; cleanup: - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (ndomains > 0) { + for (i = 0 ; i < ndomains; i++) + virDomainFree(domains[i]); + free(domains); + } return ret; } @@ -870,14 +773,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *pools; - gchar **inactive = NULL; - gint ninactive = 0; - gchar **active = NULL; - gint nactive = 0; + virStoragePoolPtr *vpools = NULL; + gint npools = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -901,77 +801,31 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - active = fetch_list(vconn, - "Storage Pools", - virConnectNumOfStoragePools, - virConnectListStoragePools, - cancellable, - &nactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; + npools = virConnectListAllStoragePools(vconn, &vpools, 0); + if (npools < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of pools")); goto cleanup; } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Storage Pools", - virConnectNumOfDefinedStoragePools, - virConnectListDefinedStoragePools, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - pools = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virStoragePoolPtr vpool; + for (i = 0 ; i < npools; i++) { GVirStoragePool *pool; - vpool = virStoragePoolLookupByName(vconn, active[i]); - if (!vpool) - continue; - - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, - NULL)); - virStoragePoolFree(vpool); - - g_hash_table_insert(pools, - (gpointer)gvir_storage_pool_get_uuid(pool), - pool); - } - - for (i = 0 ; i < ninactive ; i++) { if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - virStoragePoolPtr vpool; - GVirStoragePool *pool; - - vpool = virStoragePoolLookupByName(vconn, inactive[i]); - if (!vpool) - continue; - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, + "handle", vpools[i], NULL)); - virStoragePoolFree(vpool); - g_hash_table_insert(pools, (gpointer)gvir_storage_pool_get_uuid(pool), pool); @@ -987,12 +841,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: - for (i = 0 ; i < nactive ; i++) - g_free(active[i]); - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (npools > 0) { + for (i = 0 ; i < npools; i++) + virStoragePoolFree(vpools[i]); + free(vpools); + } return ret; } -- 2.4.3

3 29

[libvirt] [PATCHv2] nodedev: add RDMA and tx-udp_tnl-segmentation NIC capabilities
by Moshe Levi 21 Jul '15

21 Jul '15

Adding functionality to libvirt that will allow it query the interface for the availability of RDMA and tx-udp_tnl-segmentation Offloading NIC capabilities Here is an example of the feature XML definition: <device> <name>net_eth4_90_e2_ba_5e_a5_45</name> <path>/sys/devices/pci0000:00/0000:00:03.0/0000:08:00.1/net/eth4</path> <parent>pci_0000_08_00_1</parent> <capability type='net'> <interface>eth4</interface> <address>90:e2:ba:5e:a5:45</address> <link speed='10000' state='up'/> <feature name='rx'/> <feature name='tx'/> <feature name='sg'/> <feature name='tso'/> <feature name='gso'/> <feature name='gro'/> <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> <capability type='80203'/> </capability> </device> --- configure.ac | 2 +- docs/formatnode.html.in | 2 + src/conf/device_conf.c | 4 +- src/conf/device_conf.h | 2 + src/util/virnetdev.c | 141 +++++++++++++++++++-- src/util/virnetdev.h | 1 + tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 2 + tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 2 + 8 files changed, 144 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a7f38e8..70b3ef3 100644 --- a/configure.ac +++ b/configure.ac @@ -390,7 +390,7 @@ AC_CHECK_TYPE([struct ifreq], ]]) AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO, - ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS], + ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES], [], [], [[#include <linux/ethtool.h> ]]) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 3ff1bef..ed00af5 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -199,6 +199,8 @@ <dt><code>txvlan</code></dt><dd>tx-vlan-offload</dd> <dt><code>ntuple</code></dt><dd>ntuple-filters</dd> <dt><code>rxhash</code></dt><dd>receive-hashing</dd> + <dt><code>rdma</code></dt><dd>remote-direct-memory-access</dd> + <dt><code>txudptnl</code></dt><dd>tx-udp-tunnel-segmentation</dd> </dl> </dd> <dt><code>capability</code></dt> diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 98808e2..e7b7957 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -51,7 +51,9 @@ VIR_ENUM_IMPL(virNetDevFeature, "rxvlan", "txvlan", "ntuple", - "rxhash") + "rxhash", + "rdma", + "txudptnl") int virDevicePCIAddressIsValid(virDevicePCIAddressPtr addr) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 7ea90f6..40a2b3d 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -74,6 +74,8 @@ typedef enum { VIR_NET_DEV_FEAT_TXVLAN, VIR_NET_DEV_FEAT_NTUPLE, VIR_NET_DEV_FEAT_RXHASH, + VIR_NET_DEV_FEAT_RDMA, + VIR_NET_DEV_FEAT_TXUDPTNL, VIR_NET_DEV_FEAT_LAST } virNetDevFeature; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e4fcd81..0dcb42d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -87,6 +87,14 @@ VIR_LOG_INIT("util.netdev"); # define VIR_IFF_ALLMULTI 0 #endif +#define RESOURCE_FILE_LEN 4096 +#define TX_UDP_TNL 25 +#define GFEATURES_SIZE 2 +#define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].field) +#define FEATURE_FIELD_FLAG(index) (1U << (index) % 32U) +#define FEATURE_BIT_IS_SET(blocks, index, field) \ + (FEATURE_WORD(blocks, index, field) & FEATURE_FIELD_FLAG(index)) + typedef enum { VIR_MCAST_TYPE_INDEX_TOKEN, VIR_MCAST_TYPE_NAME_TOKEN, @@ -1868,7 +1876,6 @@ virNetDevReplaceMacAddress(const char *linkdev, goto cleanup; ret = 0; - cleanup: VIR_FREE(path); return ret; @@ -2858,9 +2865,9 @@ static int virNetDevGetMulticastTable(const char *ifname, } ret = 0; + cleanup: virNetDevMcastListClear(&mcast); - return ret; } @@ -2943,11 +2950,76 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } + +/** + * virNetDevRDMAFeature + * This function checks for the availability of RDMA feature + * and add it to bitmap + * + * @ifname: name of the interface + * @out: add RDMA feature if exist to bitmap + * + * Returns 0 on success, -1 on failure. + */ +static int +virNetDevRDMAFeature(const char *ifname, + virBitmapPtr *out) +{ + char *eth_devpath = NULL; + char *ib_devpath = NULL; + char *eth_res_buf = NULL; + char *ib_res_buf = NULL; + DIR *dirp = NULL; + struct dirent *dp; + int ret = -1; + + if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) { + virReportSystemError(errno, + _("Failed to opendir path '%s'"), + SYSFS_INFINIBAND_DIR); + goto cleanup; + } + + if (virAsprintf(&eth_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0) + goto cleanup; + if (!virFileExists(eth_devpath)) + goto cleanup; + if (virFileReadAll(eth_devpath, RESOURCE_FILE_LEN, &eth_res_buf) < 0) + goto cleanup; + + while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { + if (dp->d_name[0] == '.') + continue; + if (virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", dp->d_name) < 0) { + VIR_FREE(ib_devpath); + continue; + } + if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) < 0) { + VIR_FREE(ib_res_buf); + continue; + } + if (STREQ(eth_res_buf, ib_res_buf)) { + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); + break; + } + VIR_FREE(ib_res_buf); + } + ret = 0; + + cleanup: + closedir(dirp); + VIR_FREE(eth_devpath); + VIR_FREE(ib_devpath); + VIR_FREE(eth_res_buf); + VIR_FREE(ib_res_buf); + return ret; +} + #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** - * virNetDevFeatureAvailable - * This function checks for the availability of a network device feature + * virNetDevSendEthtoolIoctl + * This function sends ethtool ioctl request * * @ifname: name of the interface * @cmd: reference to an ethtool command structure @@ -2955,7 +3027,7 @@ int virNetDevGetRxFilter(const char *ifname, * Returns 0 on success, -1 on failure. */ static int -virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) +virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) { int ret = -1; int sock = -1; @@ -2969,9 +3041,9 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) memset(&ifr, 0, sizeof(ifr)); strcpy(ifr.ifr_name, ifname); - ifr.ifr_data = (void*) cmd; - - if (ioctl(sock, SIOCETHTOOL, &ifr) != 0) { + ifr.ifr_data = cmd; + ret = ioctl(sock, SIOCETHTOOL, &ifr); + if (ret != 0) { switch (errno) { case EPERM: VIR_DEBUG("ethtool ioctl: permission denied"); @@ -2988,11 +3060,51 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) } } - ret = cmd->data > 0 ? 1: 0; cleanup: if (sock) VIR_FORCE_CLOSE(sock); + return ret; +} + +/** +* virNetDevFeatureAvailable +* This function checks for the availability of a network device feature +* +* @ifname: name of the interface +* @cmd: reference to an ethtool command structure +* +* Returns 0 if not found, 1 on success, and -1 on failure. +*/ +static int +virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) +{ + int ret = -1; + + cmd = (void*)cmd; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = cmd->data > 0 ? 1: 0; + return ret; +} + + +/** + * virNetDevGFeatureAvailable + * This function checks for the availability of a network device gfeature + * + * @ifname: name of the interface + * @cmd: reference to a gfeatures ethtool command structure + * + * Returns 0 if not found, 1 on success, and -1 on failure. + */ +static int +virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) +{ + int ret = -1; + + cmd = (void*)cmd; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); return ret; } @@ -3013,7 +3125,7 @@ virNetDevGetFeatures(const char *ifname, { size_t i = -1; struct ethtool_value cmd = { 0 }; - + struct ethtool_gfeatures g_cmd = { 0 }; struct elem{ const int cmd; const virNetDevFeature feat; @@ -3069,6 +3181,15 @@ virNetDevGetFeatures(const char *ifname, } # endif +# if HAVE_DECL_ETHTOOL_GFEATURES + g_cmd.cmd = ETHTOOL_GFEATURES; + g_cmd.size = GFEATURES_SIZE; + if (virNetDevGFeatureAvailable(ifname, &g_cmd)) + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_TXUDPTNL)); +# endif + + if (virNetDevRDMAFeature(ifname, out)) + return -1; return 0; } #else diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 190b70e..fff881c 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -210,6 +210,7 @@ int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; # define SYSFS_NET_DIR "/sys/class/net/" +# define SYSFS_INFINIBAND_DIR "/sys/class/infiniband/" int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml index 2a34fed..d4c96e8 100644 --- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml @@ -13,6 +13,8 @@ <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> + <feature name='rdma'/> + <feature name='txudptnl'/> <capability type='80211'/> </capability> </device> diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml index 81d398c..71bf90e 100644 --- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml @@ -13,6 +13,8 @@ <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> + <feature name='rdma'/> + <feature name='txudptnl'/> <capability type='80203'/> </capability> </device> -- 1.7.1

2 3

[libvirt] [PATCH v2] network: add an option to make dns public
by Cédric Bosdonnat 21 Jul '15

21 Jul '15

In some use cases we don't want the virtual network's DNS to only listen to the vnet interface. Adding a publiclyAccessible attribute to the dns element in the configuration allows the DNS to listen to all interfaces. It simply disables the bind-dynamic option of dnsmasq for the network. --- This patch is v2 for this one: https://www.redhat.com/archives/libvir-list/2015-June/msg00018.html Diff to v1: * Use bind-interface if public DNS is requested * Add more tests * Write out the public value in the format function * Fixed the rng * Renamed the attribute to public: shouldn't mislead users I tested this patch with several configurations of running networks. The only thing I noted though is that the user may need to adapt the system dnsmasq to avoid address:port conflicts... but hey, when one uses such a hacky feature of the libvirt network, he needs to take care of the rest ;) docs/formatnetwork.html.in | 9 +++++++ docs/schemas/network.rng | 5 ++++ src/conf/network_conf.c | 28 ++++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 3 ++- .../nat-network-dns-not-public.conf | 15 ++++++++++++ .../nat-network-dns-not-public.xml | 15 ++++++++++++ .../nat-network-dns-public.conf | 15 ++++++++++++ .../networkxml2confdata/nat-network-dns-public.xml | 15 ++++++++++++ tests/networkxml2xmlin/nat-network-dns-public.xml | 9 +++++++ tests/networkxml2xmlout/nat-network-dns-public.xml | 11 +++++++++ tests/networkxml2xmltest.c | 1 + 12 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-not-public.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-not-public.xml create mode 100644 tests/networkxml2confdata/nat-network-dns-public.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-public.xml create mode 100644 tests/networkxml2xmlin/nat-network-dns-public.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-public.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 6abed8f..0141d93 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -851,6 +851,15 @@ DNS server. + + The dns element + can have an optional <code>public</code> attribute + Since 1.2.17. If <code>public</code> + is "yes", then the DNS server will handle requests for all interfaces. + If <code>public</code> is not set or "no", the DNS server will + only handle requests for the interface of the virtual network. + + Currently supported sub-elements of <code><dns></code> are: <dl> <dt><code>forwarder</code></dt> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4edb6eb..f70e3dc 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -249,6 +249,11 @@ <ref name="virYesNo"/> </attribute> </optional> + <optional> + <attribute name="public"> + <ref name="virYesNo"/> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="forwarder"> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 72006e9..e90c004 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1332,9 +1332,14 @@ virNetworkDNSDefParseXML(const char *networkName, size_t i; int ret = -1; xmlNodePtr save = ctxt->node; + char *public = NULL; ctxt->node = node; + public = virXPathString("string(./@public)", ctxt); + if (public) + def->public = virTristateBoolTypeFromString(public); + forwardPlainNames = virXPathString("string(./@forwardPlainNames)", ctxt); if (forwardPlainNames) { def->forwardPlainNames = virTristateBoolTypeFromString(forwardPlainNames); @@ -1433,6 +1438,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: + VIR_FREE(public); VIR_FREE(forwardPlainNames); VIR_FREE(fwdNodes); VIR_FREE(hostNodes); @@ -2416,7 +2422,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, size_t i, j; if (!(def->forwardPlainNames || def->nfwds || def->nhosts || - def->nsrvs || def->ntxts)) + def->nsrvs || def->ntxts || def->public)) return 0; virBufferAddLit(buf, "<dns"); @@ -2431,7 +2437,25 @@ virNetworkDNSDefFormat(virBufferPtr buf, return -1; } virBufferAsprintf(buf, " forwardPlainNames='%s'", fwd); - if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts || + def->public)) { + virBufferAddLit(buf, "/>\n"); + return 0; + } + } + + if (def->public) { + const char *public = virTristateBoolTypeToString(def->public); + + if (!public) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown public type %d in network"), + def->public); + return -1; + } + virBufferAsprintf(buf, " public='%s'", public); + if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts || + def->forwardPlainNames)) { virBufferAddLit(buf, "/>\n"); return 0; } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1cd5100..ae239b8 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -136,6 +136,7 @@ struct _virNetworkDNSDef { virNetworkDNSSrvDefPtr srvs; size_t nfwds; char **forwarders; + int public; /* enum virTristateBool */ }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3d6721b..8b11b51 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -991,7 +991,8 @@ networkDnsmasqConfContents(virNetworkObjPtr network, /* dnsmasq will *always* listen on localhost unless told otherwise */ virBufferAddLit(&configbuf, "except-interface=lo\n"); - if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { + if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) && + network->def->dns.public != VIR_TRISTATE_BOOL_YES) { /* using --bind-dynamic with only --interface (no * --listen-address) prevents dnsmasq from responding to dns * queries that arrive on some interface other than our bridge diff --git a/tests/networkxml2confdata/nat-network-dns-not-public.conf b/tests/networkxml2confdata/nat-network-dns-not-public.conf new file mode 100644 index 0000000..021316f --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-not-public.conf @@ -0,0 +1,15 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain=example.com +expand-hosts +domain-needed +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-not-public.xml b/tests/networkxml2confdata/nat-network-dns-not-public.xml new file mode 100644 index 0000000..cc78f34 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-not-public.xml @@ -0,0 +1,15 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <domain name="example.com"/> + <dns forwardPlainNames='no' public='no'> + <host ip='192.168.122.1'> + <hostname>host</hostname> + <hostname>gateway</hostname> + </host> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2confdata/nat-network-dns-public.conf b/tests/networkxml2confdata/nat-network-dns-public.conf new file mode 100644 index 0000000..05cbf43 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-public.conf @@ -0,0 +1,15 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain=example.com +expand-hosts +domain-needed +local=// +except-interface=lo +bind-interfaces +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-public.xml b/tests/networkxml2confdata/nat-network-dns-public.xml new file mode 100644 index 0000000..9c59c7b --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-public.xml @@ -0,0 +1,15 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <domain name="example.com"/> + <dns forwardPlainNames='no' public='yes'> + <host ip='192.168.122.1'> + <hostname>host</hostname> + <hostname>gateway</hostname> + </host> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmlin/nat-network-dns-public.xml b/tests/networkxml2xmlin/nat-network-dns-public.xml new file mode 100644 index 0000000..0765a83 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-dns-public.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns public='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-public.xml b/tests/networkxml2xmlout/nat-network-dns-public.xml new file mode 100644 index 0000000..66caacd --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-dns-public.xml @@ -0,0 +1,11 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'> + <interface dev='eth0'/> + </forward> + <bridge name='virbr0' stp='on' delay='0'/> + <dns public='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 290336e..ba565bc 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -97,6 +97,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record-minimal"); DO_TEST("nat-network-dns-hosts"); DO_TEST("nat-network-dns-forward-plain"); + DO_TEST("nat-network-dns-public"); DO_TEST("nat-network-dns-forwarders"); DO_TEST("nat-network-forward-nat-address"); DO_TEST("8021Qbh-net"); -- 2.1.4

3 3

[libvirt] [PATCH v6 0/5] nodeinfo: Add support for subcores
by Andrea Bolognani 21 Jul '15

21 Jul '15

Changes from v5 to v6: * updated to work on top of [PATCH v2 00/10] nodeinfo: Various cleanups I'm only sending patch 1/5 to the list, because all the other commits haven't changed since v5 and because this way there's no need to perform moderation due to the message size. For the same reason, I've heavily edited the following summary by cutting out everything that belonged to a test case. Cheers. Andrea Bolognani (3): tests: Add subcores-default nodeinfo test tests: Add subcores-partial nodeinfo test tests: Add subcores-invalid nodeinfo test Shivaprasad G Bhat (2): nodeinfo: Fix output on PPC64 KVM hosts tests: Prepare for subcore tests src/libvirt_private.syms | 1 + src/nodeinfo.c | 144 ++++++++++++++++++++- src/nodeinfo.h | 1 + tests/Makefile.am | 6 + [...] tests/nodeinfomock.c | 35 +++++ tests/nodeinfotest.c | 5 +- 1348 files changed, 2122 insertions(+), 6 deletions(-) [...] create mode 100644 tests/nodeinfomock.c -- 2.4.3

1 1

[libvirt] [PATCH 00/10] nodeinfo: Various cleanups
by Andrea Bolognani 21 Jul '15

21 Jul '15

Note: this series is to be applied on top of the [PATCH 00/03] nodeinfo: Various fixes series I've posted at the same time. A bunch of improvements and cleanups that make the nodeinfo code a bit nicer, more streamlined and less redundant, hopefully not just to my eyes. Andrea Bolognani (10): nodeinfo: Introduce linuxGetCPUGlobalPath() nodeinfo: Introduce linuxGetCPUOnlinePath() nodeinfo: Rename linuxParseCPUmax() to linuxParseCPUCount() nodeinfo: Add old kernel compatibility to nodeGetPresentCPUBitmap() nodeinfo: Add out parameter to nodeGetPresentCPUBitmap() nodeinfo: Rename nodeGetCPUBitmap() to nodeGetOnlineCPUBitmap() nodeinfo: Phase out cpu_set_t usage nodeinfo: Use nodeGetOnlineCPUBitmap() when parsing node nodeinfo: Use a bitmap to keep track of node CPUs nodeinfo: Calculate present and online CPUs only once src/libvirt_private.syms | 2 +- src/nodeinfo.c | 211 +++++++++++++++++++++++++++++------------------ src/nodeinfo.h | 6 +- src/util/vircgroup.c | 4 +- 4 files changed, 139 insertions(+), 84 deletions(-) -- 2.4.3

2 28

[libvirt] [PATCH 0/3] nodeinfo: Various fixes
by Andrea Bolognani 20 Jul '15

20 Jul '15

This series fixes a bunch of issues currently affecting nodeinfo and related tests. Andrea Bolognani (3): tests: Restore links in deconfigured-cpus nodeinfo test nodeinfo: Add nodeGetPresentCPUBitmap() to libvirt_private.syms nodeinfo: Fix nodeGetCPUBitmap()'s fallback code path src/libvirt_private.syms | 1 + src/nodeinfo.c | 8 ++++- .../cpu/cpu128/topology/core_id | 2 +- .../cpu/cpu16/topology/core_id | 2 +- .../cpu/cpu24/topology/core_id | 2 +- .../cpu/cpu48/topology/core_id | 2 +- .../cpu/cpu72/topology/core_id | 2 +- .../linux-deconfigured-cpus/node/node0/cpu0 | 1 + .../linux-deconfigured-cpus/node/node0/cpu1 | 1 + .../linux-deconfigured-cpus/node/node0/cpu10 | 1 + .../linux-deconfigured-cpus/node/node0/cpu100 | 1 + .../linux-deconfigured-cpus/node/node0/cpu101 | 1 + .../linux-deconfigured-cpus/node/node0/cpu102 | 1 + .../linux-deconfigured-cpus/node/node0/cpu103 | 1 + .../linux-deconfigured-cpus/node/node0/cpu11 | 1 + .../linux-deconfigured-cpus/node/node0/cpu12 | 1 + .../linux-deconfigured-cpus/node/node0/cpu13 | 1 + .../linux-deconfigured-cpus/node/node0/cpu14 | 1 + .../linux-deconfigured-cpus/node/node0/cpu144 | 1 + .../linux-deconfigured-cpus/node/node0/cpu145 | 1 + .../linux-deconfigured-cpus/node/node0/cpu146 | 1 + .../linux-deconfigured-cpus/node/node0/cpu147 | 1 + .../linux-deconfigured-cpus/node/node0/cpu148 | 1 + .../linux-deconfigured-cpus/node/node0/cpu149 | 1 + .../linux-deconfigured-cpus/node/node0/cpu15 | 1 + .../linux-deconfigured-cpus/node/node0/cpu150 | 1 + .../linux-deconfigured-cpus/node/node0/cpu151 | 1 + .../linux-deconfigured-cpus/node/node0/cpu152 | 1 + .../linux-deconfigured-cpus/node/node0/cpu153 | 1 + .../linux-deconfigured-cpus/node/node0/cpu154 | 1 + .../linux-deconfigured-cpus/node/node0/cpu155 | 1 + .../linux-deconfigured-cpus/node/node0/cpu156 | 1 + .../linux-deconfigured-cpus/node/node0/cpu157 | 1 + .../linux-deconfigured-cpus/node/node0/cpu158 | 1 + .../linux-deconfigured-cpus/node/node0/cpu159 | 1 + .../linux-deconfigured-cpus/node/node0/cpu16 | 1 + .../linux-deconfigured-cpus/node/node0/cpu17 | 1 + .../linux-deconfigured-cpus/node/node0/cpu18 | 1 + .../linux-deconfigured-cpus/node/node0/cpu19 | 1 + .../linux-deconfigured-cpus/node/node0/cpu2 | 1 + .../linux-deconfigured-cpus/node/node0/cpu20 | 1 + .../linux-deconfigured-cpus/node/node0/cpu21 | 1 + .../linux-deconfigured-cpus/node/node0/cpu22 | 1 + .../linux-deconfigured-cpus/node/node0/cpu23 | 1 + .../linux-deconfigured-cpus/node/node0/cpu24 | 1 + .../linux-deconfigured-cpus/node/node0/cpu25 | 1 + .../linux-deconfigured-cpus/node/node0/cpu26 | 1 + .../linux-deconfigured-cpus/node/node0/cpu27 | 1 + .../linux-deconfigured-cpus/node/node0/cpu28 | 1 + .../linux-deconfigured-cpus/node/node0/cpu29 | 1 + .../linux-deconfigured-cpus/node/node0/cpu3 | 1 + .../linux-deconfigured-cpus/node/node0/cpu30 | 1 + .../linux-deconfigured-cpus/node/node0/cpu31 | 1 + .../linux-deconfigured-cpus/node/node0/cpu32 | 1 + .../linux-deconfigured-cpus/node/node0/cpu33 | 1 + .../linux-deconfigured-cpus/node/node0/cpu34 | 1 + .../linux-deconfigured-cpus/node/node0/cpu35 | 1 + .../linux-deconfigured-cpus/node/node0/cpu36 | 1 + .../linux-deconfigured-cpus/node/node0/cpu37 | 1 + .../linux-deconfigured-cpus/node/node0/cpu38 | 1 + .../linux-deconfigured-cpus/node/node0/cpu39 | 1 + .../linux-deconfigured-cpus/node/node0/cpu4 | 1 + .../linux-deconfigured-cpus/node/node0/cpu5 | 1 + .../linux-deconfigured-cpus/node/node0/cpu56 | 1 + .../linux-deconfigured-cpus/node/node0/cpu57 | 1 + .../linux-deconfigured-cpus/node/node0/cpu58 | 1 + .../linux-deconfigured-cpus/node/node0/cpu59 | 1 + .../linux-deconfigured-cpus/node/node0/cpu6 | 1 + .../linux-deconfigured-cpus/node/node0/cpu60 | 1 + .../linux-deconfigured-cpus/node/node0/cpu61 | 1 + .../linux-deconfigured-cpus/node/node0/cpu62 | 1 + .../linux-deconfigured-cpus/node/node0/cpu63 | 1 + .../linux-deconfigured-cpus/node/node0/cpu64 | 1 + .../linux-deconfigured-cpus/node/node0/cpu65 | 1 + .../linux-deconfigured-cpus/node/node0/cpu66 | 1 + .../linux-deconfigured-cpus/node/node0/cpu67 | 1 + .../linux-deconfigured-cpus/node/node0/cpu68 | 1 + .../linux-deconfigured-cpus/node/node0/cpu69 | 1 + .../linux-deconfigured-cpus/node/node0/cpu7 | 1 + .../linux-deconfigured-cpus/node/node0/cpu70 | 1 + .../linux-deconfigured-cpus/node/node0/cpu71 | 1 + .../linux-deconfigured-cpus/node/node0/cpu8 | 1 + .../linux-deconfigured-cpus/node/node0/cpu80 | 1 + .../linux-deconfigured-cpus/node/node0/cpu81 | 1 + .../linux-deconfigured-cpus/node/node0/cpu82 | 1 + .../linux-deconfigured-cpus/node/node0/cpu83 | 1 + .../linux-deconfigured-cpus/node/node0/cpu84 | 1 + .../linux-deconfigured-cpus/node/node0/cpu85 | 1 + .../linux-deconfigured-cpus/node/node0/cpu86 | 1 + .../linux-deconfigured-cpus/node/node0/cpu87 | 1 + .../linux-deconfigured-cpus/node/node0/cpu88 | 1 + .../linux-deconfigured-cpus/node/node0/cpu89 | 1 + .../linux-deconfigured-cpus/node/node0/cpu9 | 1 + .../linux-deconfigured-cpus/node/node0/cpu90 | 1 + .../linux-deconfigured-cpus/node/node0/cpu91 | 1 + .../linux-deconfigured-cpus/node/node0/cpu92 | 1 + .../linux-deconfigured-cpus/node/node0/cpu93 | 1 + .../linux-deconfigured-cpus/node/node0/cpu94 | 1 + .../linux-deconfigured-cpus/node/node0/cpu95 | 1 + .../linux-deconfigured-cpus/node/node0/cpu96 | 1 + .../linux-deconfigured-cpus/node/node0/cpu97 | 1 + .../linux-deconfigured-cpus/node/node0/cpu98 | 1 + .../linux-deconfigured-cpus/node/node0/cpu99 | 1 + .../linux-deconfigured-cpus/node/node0/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node1/cpu40 | 1 + .../linux-deconfigured-cpus/node/node1/cpu41 | 1 + .../linux-deconfigured-cpus/node/node1/cpu42 | 1 + .../linux-deconfigured-cpus/node/node1/cpu43 | 1 + .../linux-deconfigured-cpus/node/node1/cpu44 | 1 + .../linux-deconfigured-cpus/node/node1/cpu45 | 1 + .../linux-deconfigured-cpus/node/node1/cpu46 | 1 + .../linux-deconfigured-cpus/node/node1/cpu47 | 1 + .../linux-deconfigured-cpus/node/node1/cpu48 | 1 + .../linux-deconfigured-cpus/node/node1/cpu49 | 1 + .../linux-deconfigured-cpus/node/node1/cpu50 | 1 + .../linux-deconfigured-cpus/node/node1/cpu51 | 1 + .../linux-deconfigured-cpus/node/node1/cpu52 | 1 + .../linux-deconfigured-cpus/node/node1/cpu53 | 1 + .../linux-deconfigured-cpus/node/node1/cpu54 | 1 + .../linux-deconfigured-cpus/node/node1/cpu55 | 1 + .../linux-deconfigured-cpus/node/node1/cpu72 | 1 + .../linux-deconfigured-cpus/node/node1/cpu73 | 1 + .../linux-deconfigured-cpus/node/node1/cpu74 | 1 + .../linux-deconfigured-cpus/node/node1/cpu75 | 1 + .../linux-deconfigured-cpus/node/node1/cpu76 | 1 + .../linux-deconfigured-cpus/node/node1/cpu77 | 1 + .../linux-deconfigured-cpus/node/node1/cpu78 | 1 + .../linux-deconfigured-cpus/node/node1/cpu79 | 1 + .../linux-deconfigured-cpus/node/node1/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node16/cpu104 | 1 + .../linux-deconfigured-cpus/node/node16/cpu105 | 1 + .../linux-deconfigured-cpus/node/node16/cpu106 | 1 + .../linux-deconfigured-cpus/node/node16/cpu107 | 1 + .../linux-deconfigured-cpus/node/node16/cpu108 | 1 + .../linux-deconfigured-cpus/node/node16/cpu109 | 1 + .../linux-deconfigured-cpus/node/node16/cpu110 | 1 + .../linux-deconfigured-cpus/node/node16/cpu111 | 1 + .../linux-deconfigured-cpus/node/node16/cpu112 | 1 + .../linux-deconfigured-cpus/node/node16/cpu113 | 1 + .../linux-deconfigured-cpus/node/node16/cpu114 | 1 + .../linux-deconfigured-cpus/node/node16/cpu115 | 1 + .../linux-deconfigured-cpus/node/node16/cpu116 | 1 + .../linux-deconfigured-cpus/node/node16/cpu117 | 1 + .../linux-deconfigured-cpus/node/node16/cpu118 | 1 + .../linux-deconfigured-cpus/node/node16/cpu119 | 1 + .../linux-deconfigured-cpus/node/node16/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node17/cpu120 | 1 + .../linux-deconfigured-cpus/node/node17/cpu121 | 1 + .../linux-deconfigured-cpus/node/node17/cpu122 | 1 + .../linux-deconfigured-cpus/node/node17/cpu123 | 1 + .../linux-deconfigured-cpus/node/node17/cpu124 | 1 + .../linux-deconfigured-cpus/node/node17/cpu125 | 1 + .../linux-deconfigured-cpus/node/node17/cpu126 | 1 + .../linux-deconfigured-cpus/node/node17/cpu127 | 1 + .../linux-deconfigured-cpus/node/node17/cpu128 | 1 + .../linux-deconfigured-cpus/node/node17/cpu129 | 1 + .../linux-deconfigured-cpus/node/node17/cpu130 | 1 + .../linux-deconfigured-cpus/node/node17/cpu131 | 1 + .../linux-deconfigured-cpus/node/node17/cpu132 | 1 + .../linux-deconfigured-cpus/node/node17/cpu133 | 1 + .../linux-deconfigured-cpus/node/node17/cpu134 | 1 + .../linux-deconfigured-cpus/node/node17/cpu135 | 1 + .../linux-deconfigured-cpus/node/node17/cpu136 | 1 + .../linux-deconfigured-cpus/node/node17/cpu137 | 1 + .../linux-deconfigured-cpus/node/node17/cpu138 | 1 + .../linux-deconfigured-cpus/node/node17/cpu139 | 1 + .../linux-deconfigured-cpus/node/node17/cpu140 | 1 + .../linux-deconfigured-cpus/node/node17/cpu141 | 1 + .../linux-deconfigured-cpus/node/node17/cpu142 | 1 + .../linux-deconfigured-cpus/node/node17/cpu143 | 1 + .../linux-deconfigured-cpus/node/node17/meminfo | 38 +++++++++++----------- 171 files changed, 246 insertions(+), 79 deletions(-) create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 -- 2.4.3

2 4

[libvirt] [PATCH] rpc: Remove keepalive_required option
by Martin Kletzander 20 Jul '15

20 Jul '15

Since its introduction in 2011 (particularly in commit f4324e329275), the option doesn't work. It just effectively disables all incoming connections. That's because the client private data that contain the 'keepalive_supported' boolean, are initialized to zeroes so the bool is false and the only other place where the bool is used is when checking whether the client supports keepalive. Thus, according to the server, no client supports keepalive. Removing this instead of fixing it is better because a) apparently nobody ever tried it since 2011 (4 years without one month) and b) we cannot know whether the client supports keepalive until we get a ping or pong keepalive packet. And that won't happen untile after we dispatched the ConnectOpen call. Another two reasons would be c) the keepalive_required was tracked on the server level, but keepalive_supported was in private data of the client as well as the check that was made in the remote layer, thus making all other instances of virNetServer miss this feature unless they all implemented it for themselves and d) we can always add it back in case there is a request and a use-case for it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/libvirtd-config.c | 4 ---- daemon/libvirtd-config.h | 2 -- daemon/libvirtd.aug | 2 -- daemon/libvirtd.c | 2 -- daemon/libvirtd.conf | 7 ------ daemon/libvirtd.h | 1 - daemon/remote.c | 8 +------ daemon/test_libvirtd.aug.in | 2 -- src/libvirt_remote.syms | 1 - src/locking/lock_daemon.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetserver.c | 25 +--------------------- src/rpc/virnetserver.h | 3 --- .../virnetdaemondata/output-data-admin-nomdns.json | 2 -- .../virnetdaemondata/output-data-anon-clients.json | 1 - .../output-data-initial-nomdns.json | 1 - tests/virnetdaemondata/output-data-initial.json | 1 - tests/virnetdaemontest.c | 2 +- 18 files changed, 5 insertions(+), 63 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 10dcc423d2db..c31c8b2e9ab5 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -292,7 +292,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->keepalive_interval = 5; data->keepalive_count = 5; - data->keepalive_required = 0; data->admin_min_workers = 5; data->admin_max_workers = 20; @@ -302,7 +301,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->admin_keepalive_interval = 5; data->admin_keepalive_count = 5; - data->admin_keepalive_required = 0; localhost = virGetHostname(); if (localhost == NULL) { @@ -471,11 +469,9 @@ daemonConfigLoadOptions(struct daemonConfig *data, GET_CONF_INT(conf, filename, keepalive_interval); GET_CONF_UINT(conf, filename, keepalive_count); - GET_CONF_UINT(conf, filename, keepalive_required); GET_CONF_INT(conf, filename, admin_keepalive_interval); GET_CONF_UINT(conf, filename, admin_keepalive_count); - GET_CONF_UINT(conf, filename, admin_keepalive_required); return 0; diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 9cdae1a0cb59..3e1971d67f05 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -81,7 +81,6 @@ struct daemonConfig { int keepalive_interval; unsigned int keepalive_count; - int keepalive_required; int admin_min_workers; int admin_max_workers; @@ -91,7 +90,6 @@ struct daemonConfig { int admin_keepalive_interval; unsigned int admin_keepalive_count; - int admin_keepalive_required; }; diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index a70aa1dddf90..7c7992dd0568 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -79,11 +79,9 @@ module Libvirtd = let keepalive_entry = int_entry "keepalive_interval" | int_entry "keepalive_count" - | bool_entry "keepalive_required" let admin_keepalive_entry = int_entry "admin_keepalive_interval" | int_entry "admin_keepalive_count" - | bool_entry "admin_keepalive_required" let misc_entry = str_entry "host_uuid" diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 71db4a042c7f..250094bd21dd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1389,7 +1389,6 @@ int main(int argc, char **argv) { config->max_anonymous_clients, config->keepalive_interval, config->keepalive_count, - !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, remoteClientInitHook, NULL, @@ -1464,7 +1463,6 @@ int main(int argc, char **argv) { 0, config->admin_keepalive_interval, config->admin_keepalive_count, - !!config->admin_keepalive_required, NULL, remoteAdmClientInitHook, NULL, diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index ac06cdd79103..cd990b28f744 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -440,14 +440,7 @@ # #keepalive_interval = 5 #keepalive_count = 5 -# -# If set to 1, libvirtd will refuse to talk to clients that do not -# support keepalive protocol. Defaults to 0. -# -#keepalive_required = 1 # Keepalive settings for the admin interface #admin_keepalive_interval = 5 #admin_keepalive_count = 5 -# -#admin_keepalive_required = 1 diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 8c1a904893ab..efd4823ae18e 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -72,7 +72,6 @@ struct daemonClientPrivate { virConnectPtr conn; daemonClientStreamPtr streams; - bool keepalive_supported; }; /* Separate private data for admin connection */ diff --git a/daemon/remote.c b/daemon/remote.c index e9e2dcae80e0..3a3eb0913088 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1290,7 +1290,7 @@ void *remoteClientInitHook(virNetServerClientPtr client, /*----- Functions. -----*/ static int -remoteDispatchConnectOpen(virNetServerPtr server, +remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, @@ -1309,12 +1309,6 @@ remoteDispatchConnectOpen(virNetServerPtr server, goto cleanup; } - if (virNetServerKeepAliveRequired(server) && !priv->keepalive_supported) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("keepalive support is required to connect")); - goto cleanup; - } - name = args->name ? *args->name : NULL; /* If this connection arrived on a readonly socket, force diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in index 4921cbfb86b3..3c29aac9747f 100644 --- a/daemon/test_libvirtd.aug.in +++ b/daemon/test_libvirtd.aug.in @@ -57,7 +57,5 @@ module Test_libvirtd = { "host_uuid" = "00000000-0000-0000-0000-000000000000" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } - { "keepalive_required" = "1" } { "admin_keepalive_interval" = "5" } { "admin_keepalive_count" = "5" } - { "admin_keepalive_required" = "1" } diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 6bfdcfa819bf..90a453c8be9c 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -101,7 +101,6 @@ virNetServerAddProgram; virNetServerAddService; virNetServerClose; virNetServerHasClients; -virNetServerKeepAliveRequired; virNetServerNew; virNetServerNewPostExecRestart; virNetServerPreExecRestart; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ecbe03a4c154..c03502459acd 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -151,7 +151,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged) if (!(lockd->srv = virNetServerNew(1, 1, 0, config->max_clients, config->max_clients, -1, 0, - false, NULL, + NULL, virLockDaemonClientNew, virLockDaemonClientPreExecRestart, virLockDaemonClientFree, diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 110a55662be0..48a3597ed274 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -925,7 +925,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) return -1; if (!(srv = virNetServerNew(0, 0, 0, 1, - 0, -1, 0, false, + 0, -1, 0, NULL, virLXCControllerClientPrivateNew, NULL, diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 60a9714f6096..80b5588bf3c9 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -69,7 +69,6 @@ struct _virNetServer { int keepaliveInterval; unsigned int keepaliveCount; - bool keepaliveRequired; #ifdef WITH_GNUTLS virNetTLSContextPtr tls; @@ -312,7 +311,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - bool keepaliveRequired, const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, @@ -338,7 +336,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, srv->nclients_unauth_max = max_anonymous_clients; srv->keepaliveInterval = keepaliveInterval; srv->keepaliveCount = keepaliveCount; - srv->keepaliveRequired = keepaliveRequired; srv->clientPrivNew = clientPrivNew; srv->clientPrivPreExecRestart = clientPrivPreExecRestart; srv->clientPrivFree = clientPrivFree; @@ -380,7 +377,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, unsigned int max_anonymous_clients; unsigned int keepaliveInterval; unsigned int keepaliveCount; - bool keepaliveRequired; const char *mdnsGroupName = NULL; if (virJSONValueObjectGetNumberUint(object, "min_workers", &min_workers) < 0) { @@ -423,11 +419,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, _("Missing keepaliveCount data in JSON document")); goto error; } - if (virJSONValueObjectGetBoolean(object, "keepaliveRequired", &keepaliveRequired) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing keepaliveRequired data in JSON document")); - goto error; - } if (virJSONValueObjectHasKey(object, "mdnsGroupName") && (!(mdnsGroupName = virJSONValueObjectGetString(object, "mdnsGroupName")))) { @@ -440,7 +431,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, priority_workers, max_clients, max_anonymous_clients, keepaliveInterval, keepaliveCount, - keepaliveRequired, mdnsGroupName, + mdnsGroupName, clientPrivNew, clientPrivPreExecRestart, clientPrivFree, clientPrivOpaque))) goto error; @@ -573,11 +564,6 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) _("Cannot set keepaliveCount data in JSON document")); goto error; } - if (virJSONValueObjectAppendBoolean(object, "keepaliveRequired", srv->keepaliveRequired) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot set keepaliveRequired data in JSON document")); - goto error; - } if (srv->mdnsGroupName && virJSONValueObjectAppendString(object, "mdnsGroupName", srv->mdnsGroupName) < 0) { @@ -786,15 +772,6 @@ void virNetServerClose(virNetServerPtr srv) virObjectUnlock(srv); } -bool virNetServerKeepAliveRequired(virNetServerPtr srv) -{ - bool required; - virObjectLock(srv); - required = srv->keepaliveRequired; - virObjectUnlock(srv); - return required; -} - static inline size_t virNetServerTrackPendingAuthLocked(virNetServerPtr srv) { diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 0e16e8fb1bf0..89d8db9b9ee4 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -41,7 +41,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - bool keepaliveRequired, const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, @@ -74,8 +73,6 @@ int virNetServerSetTLSContext(virNetServerPtr srv, virNetTLSContextPtr tls); # endif -bool virNetServerKeepAliveRequired(virNetServerPtr srv); - size_t virNetServerTrackPendingAuth(virNetServerPtr srv); size_t virNetServerTrackCompletedAuth(virNetServerPtr srv); diff --git a/tests/virnetdaemondata/output-data-admin-nomdns.json b/tests/virnetdaemondata/output-data-admin-nomdns.json index 5df71a0d88c8..a814aeb80614 100644 --- a/tests/virnetdaemondata/output-data-admin-nomdns.json +++ b/tests/virnetdaemondata/output-data-admin-nomdns.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, @@ -70,7 +69,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-anon-clients.json b/tests/virnetdaemondata/output-data-anon-clients.json index 4e4332691aa7..05fc0ae00d3f 100644 --- a/tests/virnetdaemondata/output-data-anon-clients.json +++ b/tests/virnetdaemondata/output-data-anon-clients.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 10, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-initial-nomdns.json b/tests/virnetdaemondata/output-data-initial-nomdns.json index bef54bf94ad5..400e47bc9463 100644 --- a/tests/virnetdaemondata/output-data-initial-nomdns.json +++ b/tests/virnetdaemondata/output-data-initial-nomdns.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-initial.json b/tests/virnetdaemondata/output-data-initial.json index 9afa791d91fc..e875cffe5c01 100644 --- a/tests/virnetdaemondata/output-data-initial.json +++ b/tests/virnetdaemondata/output-data-initial.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "mdnsGroupName": "libvirtTest", "services": [ { diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index ef45018f5873..fb8a6c0c0ec5 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -50,7 +50,7 @@ testCreateServer(const char *host, int family) } if (!(srv = virNetServerNew(10, 50, 5, 100, 10, - 120, 5, true, + 120, 5, mdns_group, NULL, NULL, -- 2.4.6

1 0

[libvirt] [PATCH] nodeinfo: fix build on FreeBSD
by Roman Bogorodskiy 20 Jul '15

20 Jul '15

Currently, build fails on FreeBSD with: CC libvirt_driver_la-nodeinfo.lo nodeinfo.c:1941:56: error: use of undeclared identifier 'SYSFS_SYSTEM_PATH' const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH; ^ 1 error generated. This is caused by commit b97b3048 that added sysfs_prefix to nodeCapsInitNUMA and used SYSFS_CPU_PATH. Fix it by unconditionally defining SYSFS_CPU_PATH instead of defining it under #ifdef __linux__. --- src/nodeinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c874fa6..d7d0223 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -59,6 +59,8 @@ VIR_LOG_INIT("nodeinfo"); +#define SYSFS_SYSTEM_PATH "/sys/devices/system" + #if defined(__FreeBSD__) || defined(__APPLE__) static int appleFreebsdNodeGetCPUCount(void) @@ -283,7 +285,6 @@ freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, #ifdef __linux__ # define CPUINFO_PATH "/proc/cpuinfo" -# define SYSFS_SYSTEM_PATH "/sys/devices/system" # define PROCSTAT_PATH "/proc/stat" # define MEMINFO_PATH "/proc/meminfo" # define SYSFS_MEMORY_SHARED_PATH "/sys/kernel/mm/ksm" -- 2.4.5

2 2

[libvirt] [PATCH] qxl: Fix new function name for spice-server library
by Frediano Ziglio 20 Jul '15

20 Jul '15

The new spice-server function to limit the number of monitors (0.12.6) changed while development from spice_qxl_set_monitors_config_limit to spice_qxl_max_monitors (accepted upstream). By mistake I post patch with former name. This patch fix the function name. Signed-off-by: Frediano Ziglio <fziglio(a)redhat.com> --- hw/display/qxl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) I tested again doing a clean build, unfortunately I did some mistake and my tests worked. diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 4e5ff69..2288238 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -273,8 +273,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) } else { #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ if (qxl->max_outputs) { - spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, - qxl->max_outputs); + spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); } #endif qxl->guest_monitors_config = qxl->ram->monitors_config; -- 2.1.0

3 2

[libvirt] [PATCH v2] qemu: Reject updating unsupported disk information
by Martin Kletzander 20 Jul '15

20 Jul '15

If one calls update-device with information that is not updatable, libvirt reports success even though no data were updated. The example used in the bug linked below uses updating device with <boot order='2'/> which, in my opinion, is a valid thing to request from user's perspective. Mainly since we properly error out if user wants to update such data on a network device for example. And since there are many things that might happen (update-device on disk basically knows just how to change removable media), check for what's changing and moreover, since the function might be usable in other drivers (updating only disk path is a valid possibility) let's abstract it for any two disks. We can't possibly check for everything since for many fields our code does not properly differentiate between default and unspecified values. Even though this could be changed, I don't feel like it's worth the complexity so it's not the aim of this patch. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1007228 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - Don't say 'NULL' when it should be 'unspecified' - Don't blindly copy field name into the error message, but use space instead of dot. That way it looks the same as in the XML provided. - Check strings properly instead of addresses src/conf/domain_conf.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++ 4 files changed, 139 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1f7862b00463..69e5df27c270 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5690,6 +5690,139 @@ virDomainDiskFindByBusAndDst(virDomainDefPtr def, return NULL; } + +/* + * Makes sure the @disk differs from @orig_disk only by the source + * path and nothing else. Fields that are being checked and the + * information whether they are nullable (may not be specified) or is + * taken from the virDomainDiskDefFormat() code. + */ +bool +virDomainDiskDiffersSourceOnly(virDomainDiskDefPtr disk, + virDomainDiskDefPtr orig_disk) +{ +#define CHECK_EQ(field, field_name, nullable) \ + do { \ + if (nullable && !disk->field) \ + break; \ + if (disk->field != orig_disk->field) { \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ + _("cannot modify field '%s' of the disk"), \ + field_name); \ + return false; \ + } \ + } while (0) + + CHECK_EQ(device, "device", false); + CHECK_EQ(cachemode, "cache", true); + CHECK_EQ(error_policy, "error_policy", true); + CHECK_EQ(rerror_policy, "rerror_policy", true); + CHECK_EQ(iomode, "io", true); + CHECK_EQ(ioeventfd, "ioeventfd", true); + CHECK_EQ(event_idx, "event_idx", true); + CHECK_EQ(copy_on_read, "copy_on_read", true); + CHECK_EQ(discard, "discard", true); + CHECK_EQ(iothread, "iothread", true); + + if (disk->geometry.cylinders && + disk->geometry.heads && + disk->geometry.sectors) { + CHECK_EQ(geometry.cylinders, "geometry cylinders", false); + CHECK_EQ(geometry.heads, "geometry heads", false); + CHECK_EQ(geometry.sectors, "geometry sectors", false); + CHECK_EQ(geometry.trans, "BIOS-translation-modus", true); + } + + CHECK_EQ(blockio.logical_block_size, + "blockio logical_block_size", false); + CHECK_EQ(blockio.physical_block_size, + "blockio physical_block_size", false); + + if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) + CHECK_EQ(removable, "removable", true); + + CHECK_EQ(blkdeviotune.total_bytes_sec, + "blkdeviotune total_bytes_sec", + true); + CHECK_EQ(blkdeviotune.read_bytes_sec, + "blkdeviotune read_bytes_sec", + true); + CHECK_EQ(blkdeviotune.write_bytes_sec, + "blkdeviotune write_bytes_sec", + true); + CHECK_EQ(blkdeviotune.total_iops_sec, + "blkdeviotune total_iops_sec", + true); + CHECK_EQ(blkdeviotune.read_iops_sec, + "blkdeviotune read_iops_sec", + true); + CHECK_EQ(blkdeviotune.write_iops_sec, + "blkdeviotune write_iops_sec", + true); + CHECK_EQ(blkdeviotune.total_bytes_sec_max, + "blkdeviotune total_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.read_bytes_sec_max, + "blkdeviotune read_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.write_bytes_sec_max, + "blkdeviotune write_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.total_iops_sec_max, + "blkdeviotune total_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.read_iops_sec_max, + "blkdeviotune read_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.write_iops_sec_max, + "blkdeviotune write_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.size_iops_sec, + "blkdeviotune size_iops_sec", + true); + + if (disk->transient && STRNEQ(disk->transient, orig_disk->transient)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "transient"); + return false; + } + + if (disk->serial && STRNEQ(disk->serial, orig_disk->serial)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "serial"); + return false; + } + + if (disk->wwn && STRNEQ(disk->wwn, orig_disk->wwn)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "wwn"); + return false; + } + + if (disk->vendor && STRNEQ(disk->vendor, orig_disk->vendor)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "vendor"); + return false; + } + + if (disk->product && STRNEQ(disk->product, orig_disk->product)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "product"); + return false; + } + + CHECK_EQ(info.bootIndex, "boot order", true); + +#undef CHECK_EQ + + return true; +} + int virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt, virDomainDiskDefPtr def) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 50750c1dfa14..0fe6b1a47c8f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2474,6 +2474,8 @@ int virDomainDeviceFindControllerModel(virDomainDefPtr def, virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst); +bool virDomainDiskDiffersSourceOnly(virDomainDiskDefPtr disk, + virDomainDiskDefPtr orig_disk); void virDomainControllerDefFree(virDomainControllerDefPtr def); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 720afdf4dd11..1c7c492951ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -249,6 +249,7 @@ virDomainDiskDefFree; virDomainDiskDefNew; virDomainDiskDefSourceParse; virDomainDiskDeviceTypeToString; +virDomainDiskDiffersSourceOnly; virDomainDiskDiscardTypeToString; virDomainDiskErrorPolicyTypeFromString; virDomainDiskErrorPolicyTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c4b3979f89ef..62bba2ea4054 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7916,6 +7916,9 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, goto end; } + if (!virDomainDiskDiffersSourceOnly(disk, orig_disk)) + goto end; + /* Add the new disk src into shared disk hash table */ if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) goto end; -- 2.4.5

2 4