External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 11:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

security: apparmor: Remove unused ignoreOpenFailure

Browse Source 
true is always passed here, so delete the unused code path and
adjust the associated comment

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-10-08 11:42:21 -04:00
parent cb757f9d32
commit 780f8c94ca
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -943,30 +943,14 @@ typedef int (*disk_foreach_iterator)(virDomainDiskDefPtr disk,
/* Call iter(disk, name, depth, opaque) for each element of disk and
* its backing chain in the pre-populated disk->src.backingStore.
* ignoreOpenFailure determines whether to warn about a chain that
* mentions a backing file without also having metadata on that
* file. */
*/
static int
disk_foreach_path(virDomainDiskDefPtr disk,
bool ignoreOpenFailure,
disk_foreach_iterator iter,
void *opaque)
{
size_t depth = 0;
virStorageSourcePtr tmp;
VIR_AUTOFREE(char *) brokenRaw = NULL;
if (!ignoreOpenFailure) {
if (virStorageFileChainGetBroken(disk->src, &brokenRaw) < 0)
return -1;
if (brokenRaw) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to visit backing chain file %s"),
brokenRaw);
return -1;
}
}
for (tmp = disk->src; virStorageSourceIsBacking(tmp); tmp = tmp->backingStore) {
/* execute the callback only for local storage */
@ -1020,12 +1004,9 @@ get_files(vahControl * ctl)
if (!virStorageSourceHasBacking(disk->src))
virStorageFileGetMetadata(disk->src, -1, -1, false);
/* XXX passing ignoreOpenFailure = true to get back to the behavior
* from before using disk_foreach_path. actually we should
* be passing ignoreOpenFailure = false and handle open errors more
* careful than just ignoring them.
/* XXX should handle open errors more careful than just ignoring them.
*/
if (disk_foreach_path(disk, true, add_file_path, &buf) < 0)
if (disk_foreach_path(disk, add_file_path, &buf) < 0)
goto cleanup;
}