From 8db9b4f9a7317caeecd5ed3b7b4802f559feddd3 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 30 May 2018 12:48:34 +0200 Subject: [PATCH] qemu: domain: Process only one object in qemuDomainPrepareDiskSourceTLS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the loop from qemuDomainPrepareDiskSourceTLS and rename it to qemuDomainPrepareStorageSourceTLS. Currently there is no backing chain to prepare so fixing one device is equivalent. In the future it will be reused in a function which will do the looping. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 308eea65a9..e75b1d6342 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9955,7 +9955,7 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src, /* qemuProcessPrepareDiskSourceTLS: - * @source: pointer to host interface data for disk device + * @source: source for a disk * @cfg: driver configuration * * Updates host interface TLS encryption setting based on qemu.conf @@ -9965,17 +9965,14 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src, * Returns 0 on success, -1 on bad config/failure */ static int -qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src, - virQEMUDriverConfigPtr cfg) +qemuDomainPrepareStorageSourceTLS(virStorageSourcePtr src, + virQEMUDriverConfigPtr cfg) { - virStorageSourcePtr next; - for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) { - if (next->type == VIR_STORAGE_TYPE_NETWORK && - next->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && - qemuProcessPrepareStorageSourceTLSVxhs(next, cfg) < 0) - return -1; - } + if (src->type == VIR_STORAGE_TYPE_NETWORK && + src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && + qemuProcessPrepareStorageSourceTLSVxhs(src, cfg) < 0) + return -1; return 0; } @@ -12504,7 +12501,7 @@ qemuDomainPrepareDiskSource(virDomainDiskDefPtr disk, if (qemuDomainPrepareDiskSourceLegacy(disk, priv, cfg) < 0) return -1; - if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0) + if (qemuDomainPrepareStorageSourceTLS(disk->src, cfg) < 0) return -1; return 0; -- GitLab