43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From 19845de491a3102df4256a3457c7d5669bccda63 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Mon, 18 May 2020 10:07:30 +0200
|
||
|
|
Subject: [PATCH] Don't require secdrivers to implement
|
||
|
|
.domainMoveImageMetadata
|
||
|
|
|
||
|
|
The AppArmor secdriver does not use labels to grant access to
|
||
|
|
resources. Therefore, it doesn't use XATTRs and hence it lacks
|
||
|
|
implementation of .domainMoveImageMetadata callback. This leads
|
||
|
|
to a harmless but needless error message appearing in the logs:
|
||
|
|
|
||
|
|
virSecurityManagerMoveImageMetadata:476 : this function is not
|
||
|
|
supported by the connection driver: virSecurityManagerMoveImageMetadata
|
||
|
|
|
||
|
|
Closes: https://gitlab.com/libvirt/libvirt/-/issues/25
|
||
|
|
|
||
|
|
cherry-pick from commit: cc8c297e473afd55e5d8e35e18345d8df176059d
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||
|
|
Signed-off-by: Jin Yan <jinyan12@huawei.com>
|
||
|
|
---
|
||
|
|
src/security/security_manager.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
|
||
|
|
index fe03274..1445291 100644
|
||
|
|
--- a/src/security/security_manager.c
|
||
|
|
+++ b/src/security/security_manager.c
|
||
|
|
@@ -473,8 +473,7 @@ virSecurityManagerMoveImageMetadata(virSecurityManagerPtr mgr,
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
- virReportUnsupportedError();
|
||
|
|
- return -1;
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|