From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3F1DF1FF16B for ; Tue, 1 Jul 2025 17:48:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B041AE3D; Tue, 1 Jul 2025 17:49:08 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 1 Jul 2025 17:41:00 +0200 Message-ID: <20250701154117.434512-41-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250701154117.434512-1-f.ebner@proxmox.com> References: <20250701154117.434512-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pve-devel] [PATCH qemu-server v2 40/49] blockdev: add support for NBD paths 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Co-developed-by: Alexandre Derumier Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index bb42b4c5..6bb83ef9 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -15,6 +15,18 @@ use PVE::QemuServer::Drive qw(drive_is_cdrom); use PVE::QemuServer::Helpers; use PVE::QemuServer::Monitor qw(mon_cmd); +# gives ($host, $port, $export) +my $NBD_TCP_PATH_RE_3 = qr/nbd:(\S+):(\d+):exportname=(\S+)/; +my $NBD_UNIX_PATH_RE_2 = qr/nbd:unix:(\S+):exportname=(\S+)/; + +my sub is_nbd { + my ($drive) = @_; + + return 1 if $drive->{file} =~ $NBD_TCP_PATH_RE_3; + return 1 if $drive->{file} =~ $NBD_UNIX_PATH_RE_2; + return 0; +} + my sub tpm_backup_node_name { my ($type, $drive_id) = @_; @@ -236,7 +248,13 @@ my sub generate_file_blockdev { my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive); - if ($drive->{file} eq 'cdrom') { + if ($drive->{file} =~ m/^$NBD_UNIX_PATH_RE_2$/) { + my $server = { type => 'unix', path => "$1" }; + $blockdev = { driver => 'nbd', server => $server, export => "$2" }; + } elsif ($drive->{file} =~ m/^$NBD_TCP_PATH_RE_3$/) { + my $server = { type => 'inet', host => "$1", port => "$2" }; # port is also a string in QAPI + $blockdev = { driver => 'nbd', server => $server, export => "$3" }; + } elsif ($drive->{file} eq 'cdrom') { my $path = PVE::QemuServer::Drive::get_iso_path($storecfg, $drive->{file}); $blockdev = { driver => 'host_cdrom', filename => "$path" }; } elsif ($drive->{file} =~ m|^/|) { @@ -299,6 +317,7 @@ my sub generate_format_blockdev { die "generate_format_blockdev called without volid/path\n" if !$drive->{file}; die "generate_format_blockdev called with 'none'\n" if $drive->{file} eq 'none'; + die "generate_format_blockdev called with NBD path\n" if is_nbd($drive); my $scfg; my $format; @@ -347,7 +366,9 @@ sub generate_drive_blockdev { die "generate_drive_blockdev called with 'none'\n" if $drive->{file} eq 'none'; my $child = generate_file_blockdev($storecfg, $drive, $options); - $child = generate_format_blockdev($storecfg, $drive, $child, $options); + if (!is_nbd($drive)) { + $child = generate_format_blockdev($storecfg, $drive, $child, $options); + } if ($options->{'zero-initialized'}) { my $node_name = get_node_name('zeroinit', $drive_id, $drive->{file}, $options); -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel