[v2] qemuProcessStop: Remove image metadata only when allowed

[libvirt] [PATCH v2] qemuProcessStop: Remove image metadata only when allowed

Michal Privoznik posted 1 patch 4 years, 4 months ago

Diff against v1
Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/286fd1576672bcd66e463cc963d028ccf8316535.1575537481.git.mprivozn@redhat.com

src/qemu/qemu_process.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

Expand all Fold all

[libvirt] [PATCH v2] qemuProcessStop: Remove image metadata only when allowed

Posted by Michal Privoznik 4 years, 4 months ago

In v5.9.0-370-g8fa0374c5b I've tried to fix a bug by removing
some stale XATTRs in qemuProcessStop(). However, I forgot to
do nothing when the VIR_QEMU_PROCESS_STOP_NO_RELABEL flag was
specified.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_process.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 75ee3893c6..5e178b3c6c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7648,13 +7648,15 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     /* Do this explicitly after vm->pid is reset so that security drivers don't
      * try to enter the domain's namespace which is non-existent by now as qemu
      * is no longer running. */
-    for (i = 0; i < def->ndisks; i++) {
-        virDomainDiskDefPtr disk = def->disks[i];
+    if (!(flags & VIR_QEMU_PROCESS_STOP_NO_RELABEL)) {
+        for (i = 0; i < def->ndisks; i++) {
+            virDomainDiskDefPtr disk = def->disks[i];
 
-        if (disk->mirror)
-            qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
+            if (disk->mirror)
+                qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
 
-        qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
+            qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
+        }
     }
 
     /* clear all private data entries which are no longer needed */
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2] qemuProcessStop: Remove image metadata only when allowed

Posted by Peter Krempa 4 years, 4 months ago

On Thu, Dec 05, 2019 at 11:51:13 +0100, Michal Privoznik wrote:
> In v5.9.0-370-g8fa0374c5b I've tried to fix a bug by removing
> some stale XATTRs in qemuProcessStop(). However, I forgot to
> do nothing when the VIR_QEMU_PROCESS_STOP_NO_RELABEL flag was
> specified.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/qemu/qemu_process.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list