External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuProcessStop: Remove image metadata only when allowed

Browse Source 
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>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2019-12-04 17:36:33 +01:00
parent 6865dc295e
commit 516b867685
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_process.c
View File

@ -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 */