|
 |
c313de |
From 440629a5a95d167af717a70c8d992e104866229a Mon Sep 17 00:00:00 2001
|
|
|
c313de |
Message-Id: <440629a5a95d167af717a70c8d992e104866229a@dist-git>
|
|
|
c313de |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Date: Mon, 1 Jul 2019 17:05:59 +0200
|
|
|
c313de |
Subject: [PATCH] vircgroup: machinename will never be NULL
|
|
|
c313de |
MIME-Version: 1.0
|
|
|
c313de |
Content-Type: text/plain; charset=UTF-8
|
|
|
c313de |
Content-Transfer-Encoding: 8bit
|
|
|
c313de |
|
|
|
c313de |
Commit <eaf2c9f89107b9f60cf8db2c919f78b987ff7177> moved machineName
|
|
|
c313de |
generation before virCgroupNewDetectMachine() is called.
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
(cherry picked from commit f9d18f89f7df937b922816aeae0024d8bd6dc72e)
|
|
|
c313de |
|
|
|
c313de |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Message-Id: <2e0f6a4d02b3f97f5b9efa74a6553d5ce11d077a.1561993099.git.phrdina@redhat.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
---
|
|
|
c313de |
src/util/vircgroup.c | 27 +++++++++++----------------
|
|
|
c313de |
1 file changed, 11 insertions(+), 16 deletions(-)
|
|
|
c313de |
|
|
|
c313de |
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
|
c313de |
index a2c971fbf4..5adf9d3c11 100644
|
|
|
c313de |
--- a/src/util/vircgroup.c
|
|
|
c313de |
+++ b/src/util/vircgroup.c
|
|
|
c313de |
@@ -266,27 +266,22 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
|
|
|
c313de |
if (virCgroupPartitionEscape(&partname) < 0)
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
- if (machinename &&
|
|
|
c313de |
- (virAsprintf(&partmachinename, "%s.libvirt-%s",
|
|
|
c313de |
- machinename, drivername) < 0 ||
|
|
|
c313de |
- virCgroupPartitionEscape(&partmachinename) < 0))
|
|
|
c313de |
+ if (virAsprintf(&partmachinename, "%s.libvirt-%s",
|
|
|
c313de |
+ machinename, drivername) < 0 ||
|
|
|
c313de |
+ virCgroupPartitionEscape(&partmachinename) < 0)
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true)))
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
- /* We should keep trying even if this failed */
|
|
|
c313de |
- if (!machinename)
|
|
|
c313de |
- virResetLastError();
|
|
|
c313de |
- else if (!(scopename_new = virSystemdMakeScopeName(machinename,
|
|
|
c313de |
- drivername, false)))
|
|
|
c313de |
+ if (!(scopename_new = virSystemdMakeScopeName(machinename,
|
|
|
c313de |
+ drivername, false)))
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
if (virCgroupPartitionEscape(&scopename_old) < 0)
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
- if (scopename_new &&
|
|
|
c313de |
- virCgroupPartitionEscape(&scopename_new) < 0)
|
|
|
c313de |
+ if (virCgroupPartitionEscape(&scopename_new) < 0)
|
|
|
c313de |
return false;
|
|
|
c313de |
|
|
|
c313de |
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
|
|
|
c313de |
@@ -315,16 +310,16 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
|
|
|
c313de |
tmp++;
|
|
|
c313de |
|
|
|
c313de |
if (STRNEQ(tmp, name) &&
|
|
|
c313de |
- STRNEQ_NULLABLE(tmp, machinename) &&
|
|
|
c313de |
+ STRNEQ(tmp, machinename) &&
|
|
|
c313de |
STRNEQ(tmp, partname) &&
|
|
|
c313de |
- STRNEQ_NULLABLE(tmp, partmachinename) &&
|
|
|
c313de |
+ STRNEQ(tmp, partmachinename) &&
|
|
|
c313de |
STRNEQ(tmp, scopename_old) &&
|
|
|
c313de |
- STRNEQ_NULLABLE(tmp, scopename_new)) {
|
|
|
c313de |
+ STRNEQ(tmp, scopename_new)) {
|
|
|
c313de |
VIR_DEBUG("Name '%s' for controller '%s' does not match "
|
|
|
c313de |
"'%s', '%s', '%s', '%s' or '%s'",
|
|
|
c313de |
tmp, virCgroupControllerTypeToString(i),
|
|
|
c313de |
- name, NULLSTR(machinename), partname,
|
|
|
c313de |
- scopename_old, NULLSTR(scopename_new));
|
|
|
c313de |
+ name, machinename, partname,
|
|
|
c313de |
+ scopename_old, scopename_new);
|
|
|
c313de |
return false;
|
|
|
c313de |
}
|
|
|
c313de |
}
|
|
|
c313de |
--
|
|
|
c313de |
2.22.0
|
|
|
c313de |
|