]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Restore machinename even without cgroups
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 30 Jan 2018 22:57:24 +0000 (23:57 +0100)
committerMartin Kletzander <mkletzan@redhat.com>
Wed, 31 Jan 2018 13:51:34 +0000 (14:51 +0100)
The virresctrl will use this as well and we need to have that info after restart
to properly clean up /sys/fs/resctrl.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/qemu/qemu_cgroup.c
src/qemu/qemu_process.c

index fbf79a6d8f33db341bb1dfd5c7f9a26a493a1980..b604edb31c0df08ac60fc69b10f39c4a1d57f109 100644 (file)
@@ -986,10 +986,6 @@ qemuConnectCgroup(virDomainObjPtr vm)
     if (!virCgroupAvailable())
         goto done;
 
-    priv->machineName = qemuDomainGetMachineName(vm);
-    if (!priv->machineName)
-            goto cleanup;
-
     virCgroupFree(&priv->cgroup);
 
     if (virCgroupNewDetectMachine(vm->def->name,
index 0577f4c35d0803f056015523f4b8c0075052e25f..239798fa5d7cc7483e7156b04f71815ffbb025e6 100644 (file)
@@ -7198,6 +7198,10 @@ qemuProcessReconnect(void *opaque)
     if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
         goto error;
 
+    priv->machineName = qemuDomainGetMachineName(obj);
+    if (!priv->machineName)
+        goto error;
+
     if (qemuConnectCgroup(obj) < 0)
         goto error;