From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 14 Feb 2020 12:59:02 +0000 (+0100)
Subject: qemu_domain: Modify access to a NVMe disk iff needed
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b18328256b565806c04c153ce49fc3641412b35b;p=libvirt.git

qemu_domain: Modify access to a NVMe disk iff needed

If a domain has a NVMe disk it already has the access configured.
Trying to configure it again on a commit or some other operation
is wrong and condemned to failure.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 72f03c3a35..1adb5d7454 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11676,13 +11676,12 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver,
 
     revoke_lockspace = true;
 
-    if (qemuDomainStorageSourceAccessModifyNVMe(driver, vm, src, false) < 0)
-        goto revoke;
+    if (!(flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS)) {
+        if (qemuDomainStorageSourceAccessModifyNVMe(driver, vm, src, false) < 0)
+            goto revoke;
 
-    revoke_nvme = true;
+        revoke_nvme = true;
 
-    /* When modifying access of existing @src namespace does not need update */
-    if (!(flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS)) {
         if (qemuDomainNamespaceSetupDisk(vm, src) < 0)
             goto revoke;