]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuDomainGetMachineName: Access embeddedRoot from driver rather than cfg
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 23 Mar 2020 07:48:38 +0000 (08:48 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 7 Apr 2020 13:26:23 +0000 (15:26 +0200)
The cfg->root is going away, therefore get the info right from
the driver structure.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
src/qemu/qemu_domain.c

index 31a10fd70f5ccdc5e6497f900fbf3511d080431f..91e234d64448fbe3fde6f0798cac66c69b82d9ec 100644 (file)
@@ -12980,7 +12980,6 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virQEMUDriverPtr driver = priv->driver;
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     char *ret = NULL;
 
     if (vm->pid > 0) {
@@ -12990,7 +12989,8 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
     }
 
     if (!ret)
-        ret = virDomainDriverGenerateMachineName("qemu", cfg->root,
+        ret = virDomainDriverGenerateMachineName("qemu",
+                                                 driver->embeddedRoot,
                                                  vm->def->id, vm->def->name,
                                                  driver->privileged);