From 2358e2dd4971793f4c8cc530251ed0b01536e603 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 18 May 2020 15:11:49 +0200
Subject: [PATCH] qemuProcessStop: Reattach NVMe disks a domain is mirroring
 into

If the mirror destination is not a file but a NVMe disk, then
call qemuHostdevReAttachOneNVMeDisk() to reattach the NVMe back
to the host.

This would be done by blockjob code when the job finishes, but in
this case the job won't finish - QEMU is killed meanwhile.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1825785

cherry-pick from commit: 8fd2749b2df99f3ac27215e9e4ab8be191c39460

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Jin Yan <jinyan12@huawei.com>
---
 src/qemu/qemu_process.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 9285ace..280fed9 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7606,6 +7606,9 @@ void qemuProcessStop(virQEMUDriverPtr driver,
             if (disk->mirror) {
                 if (qemuSecurityRestoreImageLabel(driver, vm, disk->mirror, false) < 0)
                     VIR_WARN("Unable to restore security label on %s", disk->dst);
+
+                if (virStorageSourceChainHasNVMe(disk->mirror))
+                    qemuHostdevReAttachOneNVMeDisk(driver, vm->def->name, disk->mirror);
             }
 
             qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
-- 
1.8.3.1

