External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-24 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Generate domain memory backing path directly

Browse Source 
This makes qemuDomainGenerateMemoryBackingPath() nicer to call.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Martin Kletzander 2024-09-23 11:26:42 +02:00
parent f035f24777
commit 6f0974ca32
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_domain.c
View File

@ -1737,22 +1737,28 @@ qemuDomainSecretPrepare(virQEMUDriver *driver,
static int
qemuDomainGenerateMemoryBackingPath(qemuDomainObjPrivate *priv,
const virDomainDef *def,
char **path)
const virDomainDef *def)
{
virQEMUDriver *driver = priv->driver;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
const char *root = driver->embeddedRoot;
g_autofree char *shortName = NULL;
if (priv->memoryBackingDir)
return 0;
if (!(shortName = virDomainDefGetShortName(def)))
return -1;
if (root && !STRPREFIX(cfg->memoryBackingDir, root)) {
g_autofree char * hash = virDomainDriverGenerateRootHash("qemu", root);
*path = g_strdup_printf("%s/%s-%s", cfg->memoryBackingDir, hash, shortName);
priv->memoryBackingDir = g_strdup_printf("%s/%s-%s",
cfg->memoryBackingDir,
hash, shortName);
} else {
*path = g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortName);
priv->memoryBackingDir = g_strdup_printf("%s/%s",
cfg->memoryBackingDir,
shortName);
}
return 0;
@ -1803,12 +1809,7 @@ qemuDomainSetPrivatePathsOld(virQEMUDriver *driver,
priv->channelTargetDir = g_strdup_printf("%s/domain-%s",
cfg->channelTargetDir, vm->def->name);
if (!priv->memoryBackingDir &&
qemuDomainGenerateMemoryBackingPath(priv, vm->def,
&priv->memoryBackingDir) < 0)
return -1;
return 0;
return qemuDomainGenerateMemoryBackingPath(priv, vm->def);
}
@ -1830,12 +1831,7 @@ qemuDomainSetPrivatePaths(virQEMUDriver *driver,
priv->channelTargetDir = g_strdup_printf("%s/%s",
cfg->channelTargetDir, domname);
if (!priv->memoryBackingDir &&
qemuDomainGenerateMemoryBackingPath(priv, vm->def,
&priv->memoryBackingDir) < 0)
return -1;
return 0;
return qemuDomainGenerateMemoryBackingPath(priv, vm->def);
}