External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-20 04:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Introduce qemuProcessMakeDir

Browse Source 
qemuProcessMakeDir is used for creating a per-domain directory in a
given parent directory.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-11-02 13:39:28 +01:00
parent 65e6548e48
commit 856612876d
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/qemu/qemu_process.c
View File

@ -4448,6 +4448,34 @@ qemuProcessSetupBalloon(virQEMUDriverPtr driver,
} }
static int
qemuProcessMakeDir(virQEMUDriverPtr driver,
virDomainObjPtr vm,
const char *parentDir)
{
char *path = NULL;
int ret = -1;
if (virAsprintf(&path, "%s/domain-%s", parentDir, vm->def->name) < 0)
goto cleanup;
if (virFileMakePathWithMode(path, 0750) < 0) {
virReportSystemError(errno, _("Cannot create directory '%s'"), path);
goto cleanup;
}
if (virSecurityManagerDomainSetDirLabel(driver->securityManager,
vm->def, path) < 0)
goto cleanup;
ret = 0;
cleanup:
VIR_FREE(path);
return ret;
}
int qemuProcessStart(virConnectPtr conn, int qemuProcessStart(virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -4475,7 +4503,6 @@ int qemuProcessStart(virConnectPtr conn,
unsigned int hostdev_flags = 0; unsigned int hostdev_flags = 0;
size_t nnicindexes = 0; size_t nnicindexes = 0;
int *nicindexes = NULL; int *nicindexes = NULL;
char *tmppath = NULL;
qemuProcessIncomingDefPtr incoming = NULL; qemuProcessIncomingDefPtr incoming = NULL;
VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s migrateFd=%d " VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s migrateFd=%d "
@ -4755,35 +4782,10 @@ int qemuProcessStart(virConnectPtr conn,
* Create all per-domain directories in order to make sure domain * Create all per-domain directories in order to make sure domain
* with any possible seclabels can access it. * with any possible seclabels can access it.
*/ */
if (virAsprintf(&tmppath, "%s/domain-%s", cfg->libDir, vm->def->name) < 0) if (qemuProcessMakeDir(driver, vm, cfg->libDir) < 0 ||
qemuProcessMakeDir(driver, vm, cfg->channelTargetDir) < 0)
goto error; goto error;
if (virFileMakePathWithMode(tmppath, 0750) < 0) {
virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath);
goto error;
}
if (virSecurityManagerDomainSetDirLabel(driver->securityManager,
vm->def, tmppath) < 0)
goto error;
VIR_FREE(tmppath);
if (virAsprintf(&tmppath, "%s/domain-%s",
cfg->channelTargetDir, vm->def->name) < 0)
goto error;
if (virFileMakePathWithMode(tmppath, 0750) < 0) {
virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath);
goto error;
}
if (virSecurityManagerDomainSetDirLabel(driver->securityManager,
vm->def, tmppath) < 0)
goto error;
VIR_FREE(tmppath);
/* now that we know it is about to start call the hook if present */ /* now that we know it is about to start call the hook if present */
if (qemuProcessStartHook(driver, vm, if (qemuProcessStartHook(driver, vm,
VIR_HOOK_QEMU_OP_START, VIR_HOOK_QEMU_OP_START,
@ -5059,7 +5061,6 @@ int qemuProcessStart(virConnectPtr conn,
virObjectUnref(caps); virObjectUnref(caps);
VIR_FREE(nicindexes); VIR_FREE(nicindexes);
VIR_FREE(nodeset); VIR_FREE(nodeset);
VIR_FREE(tmppath);
qemuProcessIncomingDefFree(incoming); qemuProcessIncomingDefFree(incoming);
return ret; return ret;