From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 57F4F6C0C3 for ; Fri, 19 Mar 2021 14:49:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56050230A8 for ; Fri, 19 Mar 2021 14:49:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E22D423092 for ; Fri, 19 Mar 2021 14:49:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 90AA94281A for ; Fri, 19 Mar 2021 14:49:12 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 19 Mar 2021 14:49:08 +0100 Message-Id: <20210319134908.10558-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210319134908.10558-1-f.ebner@proxmox.com> References: <20210319134908.10558-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemumigrate.pm] Subject: [pve-devel] [PATCH qemu-server 3/3] code cleanup: migrate: avoid post-ifs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 13:49:14 -0000 Signed-off-by: Fabian Ebner --- PVE/QemuMigrate.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 44cecce..64794a7 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -407,11 +407,11 @@ sub sync_disks { 1, ); - $log_error->("storage '$targetsid' is not available on node '$self->{node}'") - if !$target_scfg; - - $log_error->("content type 'images' is not available on storage '$targetsid'") - if $target_scfg && !$target_scfg->{content}->{images}; + if (!$target_scfg) { + $log_error->("storage '$targetsid' is not available on node '$self->{node}'"); + } elsif (!$target_scfg->{content}->{images}) { + $log_error->("content type 'images' is not available on storage '$targetsid'"); + } PVE::Storage::foreach_volid($dl, sub { my ($volid, $sid, $volinfo) = @_; -- 2.20.1