On Thu, Feb 04, 2016 at 11:40:36AM +0100, Martin Kletzander wrote: [...]
@@ -290,12 +306,15 @@ virCgroupValidateMachineGroup(virCgroupPtr group, tmp++;
if (STRNEQ(tmp, name) && + STRNEQ_NULLABLE(tmp, machinename) && STRNEQ(tmp, partname) && - STRNEQ(tmp, scopename)) { + STRNEQ(tmp, scopename_old) && + STRNEQ_NULLABLE(tmp, scopename_new)) { VIR_DEBUG("Name '%s' for controller '%s' does not match " - "'%s', '%s' or '%s'", + "'%s', '%s', '%s', '%s' or '%s'", tmp, virCgroupControllerTypeToString(i), - name, partname, scopename); + name, machinename, partname, + scopename_old, scopename_new);
One thing, the machinename and scopename_new can by NULL and we should use NULLSTR().
goto cleanup; } }
ACK with that fix. Pavel