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 5262360E13 for ; Thu, 3 Feb 2022 13:42:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F92F2698A for ; Thu, 3 Feb 2022 13:42:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 AB91626980 for ; Thu, 3 Feb 2022 13:42:18 +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 7CA3844BDB for ; Thu, 3 Feb 2022 13:42:18 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 3 Feb 2022 13:41:33 +0100 Message-Id: <20220203124143.1931377-13-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203124143.1931377-1-f.gruenbichler@proxmox.com> References: <20220203124143.1931377-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.211 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH v4 qemu-server 05/11] nbd alloc helper: allow passing in explicit format 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: Thu, 03 Feb 2022 12:42:19 -0000 and make $volname optional, to support remote migration usage without code duplication. Signed-off-by: Fabian Grünbichler --- Notes: v2: new requires - pve-storage with UNIX import support - pve-access-control with tunnel ticket support - pve-http-server with websocket fixes PVE/QemuServer.pm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 033fe3c2..2f1c518d 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5271,11 +5271,9 @@ sub vm_migrate_get_nbd_disks { sub vm_migrate_alloc_nbd_disks { my ($storecfg, $vmid, $source_volumes, $storagemap) = @_; - my $format = undef; - my $nbd = {}; foreach my $opt (sort keys %$source_volumes) { - my ($volid, $storeid, $volname, $drive, $use_existing) = @{$source_volumes->{$opt}}; + my ($volid, $storeid, $volname, $drive, $use_existing, $format) = @{$source_volumes->{$opt}}; if ($use_existing) { $nbd->{$opt}->{drivestr} = print_drive($drive); @@ -5284,16 +5282,26 @@ sub vm_migrate_alloc_nbd_disks { next; } - # If a remote storage is specified and the format of the original - # volume is not available there, fall back to the default format. - # Otherwise use the same format as the original. + # storage mapping + volname = regular migration + # storage mapping + format = remote migration + # order of precedence, filtered by whether storage supports it: + # 1. explicit requested format + # 2. format of current volume + # 3. default format of storage if (!$storagemap->{identity}) { $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); - $format = (grep {$fileFormat eq $_} @{$validFormats}) ? $fileFormat : $defFormat; + if (!$format || !grep { $format eq $_ } @$validFormats) { + if ($volname) { + my $scfg = PVE::Storage::storage_config($storecfg, $storeid); + my $fileFormat = qemu_img_format($scfg, $volname); + $format = $fileFormat + if grep { $fileFormat eq $_ } @$validFormats; + } + $format //= $defFormat; + } } else { + # can't happen for remote migration, so $volname is always defined my $scfg = PVE::Storage::storage_config($storecfg, $storeid); $format = qemu_img_format($scfg, $volname); } -- 2.30.2