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 5232872AF5 for ; Tue, 13 Apr 2021 14:17:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A7242A967 for ; Tue, 13 Apr 2021 14:16:58 +0200 (CEST) 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 95EC92A95C for ; Tue, 13 Apr 2021 14:16:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 641A945A73 for ; Tue, 13 Apr 2021 14:16:57 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:35 +0200 Message-Id: <20210413121640.3602975-18-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> References: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/7] refactor map_storage to map_id 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: Tue, 13 Apr 2021 12:17:29 -0000 since we are going to reuse the same mechanism/code for network bridge mapping. Signed-off-by: Fabian Grünbichler --- PVE/QemuMigrate.pm | 8 ++++---- PVE/QemuServer.pm | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 5c019fc..eb95762 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -336,7 +336,7 @@ sub prepare { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1); # check if storage is available on both nodes - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + my $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $sid); my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node}); @@ -398,7 +398,7 @@ sub sync_disks { next if @{$dl->{$storeid}} == 0; - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $storeid); + my $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $storeid); # check if storage is available on target node PVE::Storage::storage_check_node($storecfg, $targetsid, $self->{node}); @@ -451,7 +451,7 @@ sub sync_disks { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + my $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $sid); # check if storage is available on both nodes my $scfg = PVE::Storage::storage_check_node($storecfg, $sid); PVE::Storage::storage_check_node($storecfg, $targetsid, $self->{node}); @@ -612,7 +612,7 @@ sub sync_disks { foreach my $volid (sort keys %$local_volumes) { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + my $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $sid); my $ref = $local_volumes->{$volid}->{ref}; if ($self->{running} && $ref eq 'config') { push @{$self->{online_local_volumes}}, $volid; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index fdb2ac9..685a191 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -102,7 +102,9 @@ PVE::JSONSchema::register_standard_option('pve-qemu-machine', { }); -sub map_storage { +# maps source to target ID +# currently used for targetstorage and targetbridge when migrating +sub map_id { my ($map, $source) = @_; return $source if !defined($map); @@ -4976,7 +4978,7 @@ sub vm_migrate_alloc_nbd_disks { # volume is not available there, fall back to the default format. # Otherwise use the same format as the original. if (!$storagemap->{identity}) { - $storeid = map_storage($storagemap, $storeid); + $storeid = map_id($storagemap, $storeid); my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($storecfg, $storeid); my $scfg = PVE::Storage::storage_config($storecfg, $storeid); my $fileFormat = qemu_img_format($scfg, $volname); -- 2.20.1