There are four places where we remove image XATTRs and in all of
them we have the same for() loop with the same body. Move it into
a separate function because I'm about to introduce fifth place
where the same needs to be done.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/qemu/qemu_block.c | 25 ++++++++++++++++++++++
src/qemu/qemu_block.h | 6 ++++++
src/qemu/qemu_blockjob.c | 45 ++++------------------------------------
3 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index b8f0208742..1140a33114 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -22,6 +22,7 @@
#include "qemu_command.h"
#include "qemu_domain.h"
#include "qemu_alias.h"
+#include "qemu_security.h"
#include "viralloc.h"
#include "virstring.h"
@@ -2588,3 +2589,27 @@ qemuBlockStorageSourceCreateDetectSize(virHashTablePtr blockNamedNodeData,
return 0;
}
+
+
+int
+qemuBlockRemoveImageMetadata(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ const char *diskTarget,
+ virStorageSourcePtr src)
+{
+ virStorageSourcePtr n;
+ int ret = 0;
+
+ for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
+ if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
+ VIR_WARN("Unable to remove disk metadata on "
+ "vm %s from %s (disk target %s)",
+ vm->def->name,
+ NULLSTR(n->path),
+ diskTarget);
+ ret = -1;
+ }
+ }
+
+ return ret;
+}
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 5ddeeaf6e2..5854641027 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -197,3 +197,9 @@ int
qemuBlockStorageSourceCreateDetectSize(virHashTablePtr blockNamedNodeData,
virStorageSourcePtr src,
virStorageSourcePtr templ);
+
+int
+qemuBlockRemoveImageMetadata(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ const char *diskTarget,
+ virStorageSourcePtr src);
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 5c294f8024..92e4d391c9 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -658,36 +658,18 @@ qemuBlockJobEventProcessLegacyCompleted(virQEMUDriverPtr driver,
virObjectUnref(disk->src);
disk->src = disk->mirror;
} else {
- virStorageSourcePtr n;
-
if (disk->mirror) {
virDomainLockImageDetach(driver->lockManager, vm, disk->mirror);
/* Ideally, we would restore seclabels on the backing chain here
* but we don't know if somebody else is not using parts of it.
* Remove security driver metadata so that they are not leaked. */
- for (n = disk->mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
- if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
- VIR_WARN("Unable to remove disk metadata on "
- "vm %s from %s (disk target %s)",
- vm->def->name,
- NULLSTR(disk->src->path),
- disk->dst);
- }
- }
+ qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
virObjectUnref(disk->mirror);
}
- for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
- if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
- VIR_WARN("Unable to remove disk metadata on "
- "vm %s from %s (disk target %s)",
- vm->def->name,
- NULLSTR(n->path),
- disk->dst);
- }
- }
+ qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
}
/* Recompute the cached backing chain to match our
@@ -754,22 +736,12 @@ qemuBlockJobEventProcessLegacy(virQEMUDriverPtr driver,
case VIR_DOMAIN_BLOCK_JOB_FAILED:
case VIR_DOMAIN_BLOCK_JOB_CANCELED:
if (disk->mirror) {
- virStorageSourcePtr n;
-
virDomainLockImageDetach(driver->lockManager, vm, disk->mirror);
/* Ideally, we would restore seclabels on the backing chain here
* but we don't know if somebody else is not using parts of it.
* Remove security driver metadata so that they are not leaked. */
- for (n = disk->mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
- if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
- VIR_WARN("Unable to remove disk metadata on "
- "vm %s from %s (disk target %s)",
- vm->def->name,
- NULLSTR(disk->src->path),
- disk->dst);
- }
- }
+ qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
virObjectUnref(disk->mirror);
disk->mirror = NULL;
@@ -1177,7 +1149,6 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
qemuBlockJobDataPtr job)
{
virDomainDiskDefPtr disk = job->disk;
- virStorageSourcePtr n;
VIR_DEBUG("active commit job '%s' on VM '%s' failed", job->name, vm->def->name);
@@ -1187,15 +1158,7 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
/* Ideally, we would make the backing chain read only again (yes, SELinux
* can do that using different labels). But that is not implemented yet and
* not leaking security driver metadata is more important. */
- for (n = disk->mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
- if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
- VIR_WARN("Unable to remove disk metadata on "
- "vm %s from %s (disk target %s)",
- vm->def->name,
- NULLSTR(disk->src->path),
- disk->dst);
- }
- }
+ qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
virObjectUnref(disk->mirror);
disk->mirror = NULL;
--
2.23.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
