From 0c09c5b0d15f8b3a7b261e85f84d5ea57c1a702a Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Oct 2017 13:16:05 +0200
Subject: [PATCH] qemu: process: Move TLS setup for storage source to
 qemuProcessPrepareDomainStorage

---
 src/qemu/qemu_domain.c  | 23 -----------------------
 src/qemu/qemu_domain.h  |  5 -----
 src/qemu/qemu_process.c | 10 +++++-----
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bf2ce29bfc..d3d5dbac66 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7720,29 +7720,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
 }
 
 
-/* qemuProcessPrepareDiskSource:
- * @def: live domain definition
- * @driver: qemu driver
- *
- * Returns 0 on success, -1 on failure
- */
-int
-qemuDomainPrepareDiskSource(virDomainDefPtr def,
-                            virQEMUDriverConfigPtr cfg)
-{
-    size_t i;
-
-    for (i = 0; i < def->ndisks; i++) {
-        if (qemuDomainPrepareDiskSourceTLS(def->disks[i]->src,
-                                           def->disks[i]->info.alias,
-                                           cfg) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
 int
 qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
 {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 23285967fa..f92841ceb9 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -873,11 +873,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
                                virQEMUDriverConfigPtr cfg)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 
-int
-qemuDomainPrepareDiskSource(virDomainDefPtr def,
-                            virQEMUDriverConfigPtr cfg)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
     ATTRIBUTE_NONNULL(1);
 
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f160933e24..8fa53f7e2d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5288,6 +5288,7 @@ static int
 qemuProcessPrepareDomainStorage(virConnectPtr conn,
                                 virQEMUDriverPtr driver,
                                 virDomainObjPtr vm,
+                                virQEMUDriverConfigPtr cfg,
                                 unsigned int flags)
 {
     size_t i;
@@ -5304,6 +5305,9 @@ qemuProcessPrepareDomainStorage(virConnectPtr conn,
             /* disk source was dropped */
             continue;
         }
+
+        if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) < 0)
+            return -1;
     }
 
     return 0;
@@ -5387,7 +5391,7 @@ qemuProcessPrepareDomain(virConnectPtr conn,
         goto cleanup;
 
     VIR_DEBUG("Setting up storage");
-    if (qemuProcessPrepareDomainStorage(conn, driver, vm, flags) < 0)
+    if (qemuProcessPrepareDomainStorage(conn, driver, vm, cfg, flags) < 0)
         goto cleanup;
 
     /* Drop possibly missing disks from the definition. */
@@ -5398,10 +5402,6 @@ qemuProcessPrepareDomain(virConnectPtr conn,
     if (qemuDomainMasterKeyCreate(vm) < 0)
         goto cleanup;
 
-    VIR_DEBUG("Prepare disk source backends for TLS");
-    if (qemuDomainPrepareDiskSource(vm->def, cfg) < 0)
-        goto cleanup;
-
     VIR_DEBUG("Prepare chardev source backends for TLS");
     qemuDomainPrepareChardevSource(vm->def, cfg);
 
-- 
GitLab