提交 be0e3115 编写于 作者: M Michal Privoznik

qemuDomainGetMachineName: Access embeddedRoot from driver rather than cfg

The cfg->root is going away, therefore get the info right from
the driver structure.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 5bc32994
...@@ -12980,7 +12980,6 @@ qemuDomainGetMachineName(virDomainObjPtr vm) ...@@ -12980,7 +12980,6 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverPtr driver = priv->driver; virQEMUDriverPtr driver = priv->driver;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
char *ret = NULL; char *ret = NULL;
if (vm->pid > 0) { if (vm->pid > 0) {
...@@ -12990,7 +12989,8 @@ qemuDomainGetMachineName(virDomainObjPtr vm) ...@@ -12990,7 +12989,8 @@ qemuDomainGetMachineName(virDomainObjPtr vm)
} }
if (!ret) if (!ret)
ret = virDomainDriverGenerateMachineName("qemu", cfg->root, ret = virDomainDriverGenerateMachineName("qemu",
driver->embeddedRoot,
vm->def->id, vm->def->name, vm->def->id, vm->def->name,
driver->privileged); driver->privileged);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册