External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

storage: Use virStoragePoolObjGetDef accessor for VSTORAGE backend

Browse Source 
In preparation for privatizing the object, use the accessor.
This commit is contained in:
John Ferlan 2017-07-26 14:36:46 -04:00
parent d823466bc2
commit 159f691fae
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/storage/storage_backend_vstorage.c
View File

@ -41,33 +41,34 @@ virStorageBackendVzPoolStart(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool) virStoragePoolObjPtr pool)
{ {
int ret = -1; int ret = -1;
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
char *grp_name = NULL; char *grp_name = NULL;
char *usr_name = NULL; char *usr_name = NULL;
char *mode = NULL; char *mode = NULL;
/* Check the permissions */ /* Check the permissions */
if (pool->def->target.perms.mode == (mode_t) - 1) if (def->target.perms.mode == (mode_t) - 1)
pool->def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE;
if (pool->def->target.perms.uid == (uid_t) -1) if (def->target.perms.uid == (uid_t) -1)
pool->def->target.perms.uid = geteuid(); def->target.perms.uid = geteuid();
if (pool->def->target.perms.gid == (gid_t) -1) if (def->target.perms.gid == (gid_t) -1)
pool->def->target.perms.gid = getegid(); def->target.perms.gid = getegid();
/* Convert ids to names because vstorage uses names */ /* Convert ids to names because vstorage uses names */
if (!(grp_name = virGetGroupName(pool->def->target.perms.gid))) if (!(grp_name = virGetGroupName(def->target.perms.gid)))
goto cleanup; goto cleanup;
if (!(usr_name = virGetUserName(pool->def->target.perms.uid))) if (!(usr_name = virGetUserName(def->target.perms.uid)))
goto cleanup; goto cleanup;
if (virAsprintf(&mode, "%o", pool->def->target.perms.mode) < 0) if (virAsprintf(&mode, "%o", def->target.perms.mode) < 0)
goto cleanup; goto cleanup;
cmd = virCommandNewArgList(VSTORAGE_MOUNT, cmd = virCommandNewArgList(VSTORAGE_MOUNT,
"-c", pool->def->source.name, "-c", def->source.name,
pool->def->target.path, def->target.path,
"-m", mode, "-m", mode,
"-g", grp_name, "-u", usr_name, "-g", grp_name, "-u", usr_name,
NULL); NULL);
@ -89,12 +90,13 @@ static int
virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) virStorageBackendVzIsMounted(virStoragePoolObjPtr pool)
{ {
int ret = -1; int ret = -1;
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
FILE *mtab; FILE *mtab;
struct mntent ent; struct mntent ent;
char buf[1024]; char buf[1024];
char *cluster = NULL; char *cluster = NULL;
if (virAsprintf(&cluster, "vstorage://%s", pool->def->source.name) < 0) if (virAsprintf(&cluster, "vstorage://%s", def->source.name) < 0)
return -1; return -1;
if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) { if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) {
@ -106,7 +108,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool)
while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) {
if (STREQ(ent.mnt_dir, pool->def->target.path) && if (STREQ(ent.mnt_dir, def->target.path) &&
STREQ(ent.mnt_fsname, cluster)) { STREQ(ent.mnt_fsname, cluster)) {
ret = 1; ret = 1;
goto cleanup; goto cleanup;
@ -126,6 +128,7 @@ static int
virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool) virStoragePoolObjPtr pool)
{ {
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
int ret = -1; int ret = -1;
int rc; int rc;
@ -134,7 +137,7 @@ virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED,
if ((rc = virStorageBackendVzIsMounted(pool)) != 1) if ((rc = virStorageBackendVzIsMounted(pool)) != 1)
return rc; return rc;
cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL); cmd = virCommandNewArgList(UMOUNT, def->target.path, NULL);
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; goto cleanup;