提交 23018c08 编写于 作者: M Michal Privoznik

qemu_domain: Separate NVRAM VAR store file name generation

Move the code that (possibly) generates filename of NVRAM VAR
store into a single function so that it can be re-used later.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NLaszlo Ersek <lersek@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 eae99ca9
...@@ -3894,14 +3894,8 @@ qemuDomainDefPostParse(virDomainDefPtr def, ...@@ -3894,14 +3894,8 @@ qemuDomainDefPostParse(virDomainDefPtr def,
goto cleanup; goto cleanup;
} }
if (def->os.loader && if (qemuDomainNVRAMPathGenerate(cfg, def) < 0)
def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && goto cleanup;
def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON &&
!def->os.loader->nvram) {
if (virAsprintf(&def->os.loader->nvram, "%s/%s_VARS.fd",
cfg->nvramDir, def->name) < 0)
goto cleanup;
}
if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0)
goto cleanup; goto cleanup;
...@@ -14023,3 +14017,19 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk) ...@@ -14023,3 +14017,19 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk)
virStorageSourceIsLocalStorage(disk->src) && disk->src->path && virStorageSourceIsLocalStorage(disk->src) && disk->src->path &&
!virFileExists(disk->src->path); !virFileExists(disk->src->path);
} }
int
qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg,
virDomainDefPtr def)
{
if (def->os.loader &&
def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH &&
def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON &&
!def->os.loader->nvram) {
return virAsprintf(&def->os.loader->nvram, "%s/%s_VARS.fd",
cfg->nvramDir, def->name);
}
return 0;
}
...@@ -1107,4 +1107,8 @@ qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv); ...@@ -1107,4 +1107,8 @@ qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv);
bool bool
qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk); qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk);
int
qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg,
virDomainDefPtr def);
#endif /* LIBVIRT_QEMU_DOMAIN_H */ #endif /* LIBVIRT_QEMU_DOMAIN_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册