NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/security: Remove the whitespace before ';'

Browse Source
This commit is contained in:
Osier Yang 2013-05-21 15:21:21 +08:00
parent 0c38d36dcf
commit 3de80af28a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/security/security_dac.c
View File

@ -847,14 +847,14 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
VIR_DEBUG("Restoring security label on %s migrated=%d", VIR_DEBUG("Restoring security label on %s migrated=%d",
def->name, migrated); def->name, migrated);
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACRestoreSecurityHostdevLabel(mgr, if (virSecurityDACRestoreSecurityHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],
NULL) < 0) NULL) < 0)
rc = -1; rc = -1;
} }
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (virSecurityDACRestoreSecurityImageLabelInt(mgr, if (virSecurityDACRestoreSecurityImageLabelInt(mgr,
def, def,
def->disks[i], def->disks[i],
@ -914,7 +914,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (!priv->dynamicOwnership) if (!priv->dynamicOwnership)
return 0; return 0;
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */ /* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR)
continue; continue;
@ -923,7 +923,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
def->disks[i]) < 0) def->disks[i]) < 0)
return -1; return -1;
} }
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACSetSecurityHostdevLabel(mgr, if (virSecurityDACSetSecurityHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],

2
src/security/security_driver.c
View File

@ -57,7 +57,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
VIR_DEBUG("name=%s", NULLSTR(name)); VIR_DEBUG("name=%s", NULLSTR(name));
for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv ; i++) { for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv; i++) {
virSecurityDriverPtr tmp = security_drivers[i]; virSecurityDriverPtr tmp = security_drivers[i];
if (name && if (name &&

8
src/security/security_selinux.c
View File

@ -1887,14 +1887,14 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
rc = -1; rc = -1;
} }
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxRestoreSecurityHostdevLabel(mgr, if (virSecuritySELinuxRestoreSecurityHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],
NULL) < 0) NULL) < 0)
rc = -1; rc = -1;
} }
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (virSecuritySELinuxRestoreSecurityImageLabelInt(mgr, if (virSecuritySELinuxRestoreSecurityImageLabelInt(mgr,
def, def,
def->disks[i], def->disks[i],
@ -2281,7 +2281,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (secdef->norelabel || data->skipAllLabel) if (secdef->norelabel || data->skipAllLabel)
return 0; return 0;
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */ /* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) { if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) {
VIR_WARN("Unable to relabel directory tree %s for disk %s", VIR_WARN("Unable to relabel directory tree %s for disk %s",
@ -2294,7 +2294,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
} }
/* XXX fixme process def->fss if relabel == true */ /* XXX fixme process def->fss if relabel == true */
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxSetSecurityHostdevLabel(mgr, if (virSecuritySELinuxSetSecurityHostdevLabel(mgr,
def, def,
def->hostdevs[i], def->hostdevs[i],

4
src/security/virt-aa-helper.c
View File

@ -952,7 +952,7 @@ get_files(vahControl * ctl)
ctl->def->consoles[i]->source.data.file.path, "rw") != 0) ctl->def->consoles[i]->source.data.file.path, "rw") != 0)
goto cleanup; goto cleanup;
for (i = 0 ; i < ctl->def->nparallels; i++) for (i = 0; i < ctl->def->nparallels; i++)
if (ctl->def->parallels[i] && if (ctl->def->parallels[i] &&
(ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || (ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
@ -965,7 +965,7 @@ get_files(vahControl * ctl)
ctl->def->parallels[i]->source.type) != 0) ctl->def->parallels[i]->source.type) != 0)
goto cleanup; goto cleanup;
for (i = 0 ; i < ctl->def->nchannels; i++) for (i = 0; i < ctl->def->nchannels; i++)
if (ctl->def->channels[i] && if (ctl->def->channels[i] &&
(ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || (ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||