From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id CFE451FF0E6 for ; Fri, 24 Jul 2026 16:34:03 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 4E92F21634; Fri, 24 Jul 2026 16:33:20 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 5/9] blockdev: implement reopen function Date: Fri, 24 Jul 2026 16:32:26 +0200 Message-ID: <20260724143240.211130-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260724143240.211130-1-f.ebner@proxmox.com> References: <20260724143240.211130-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784903533475 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.196 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 5DHMOFWJWIKTHLV7HR336F5XZCYK6OGQ X-Message-ID-Hash: 5DHMOFWJWIKTHLV7HR336F5XZCYK6OGQ X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Similar to the attach() function, but for re-opening an already attached block node. Currently limited to non-throttle nodes. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 68 ++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 11 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index 879e1aab..dea46ca0 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -548,6 +548,33 @@ my sub blockdev_add { =pod +=head3 generate_drive_blockdev_for_peer + +Helper for the C and C functions, see C for the parameter descriptions. +Returns the generated blockdev and the QMP peer information. + +=cut + +my sub generate_drive_blockdev_for_peer { + my ($storecfg, $id, $drive, $options) = @_; + + my $qmp_peer = $options->{qsd} ? qsd_qmp_peer($id) : vm_qmp_peer($id); + + my $machine_version; + if ($options->{qsd}) { # qemu-storage-daemon runs with the installed binary version + $machine_version = + 'pc-i440fx-' . PVE::QemuServer::Machine::latest_installed_machine_version(); + } else { + $machine_version = PVE::QemuServer::Machine::get_current_qemu_machine($id); + } + + my $blockdev = generate_drive_blockdev($storecfg, $drive, $machine_version, $options); + + return ($blockdev, $qmp_peer); +} + +=pod + =head3 attach my ($node_name, $read_only) = attach($storecfg, $id, $drive, $options); @@ -596,17 +623,7 @@ state image. sub attach { my ($storecfg, $id, $drive, $options) = @_; - my $qmp_peer = $options->{qsd} ? qsd_qmp_peer($id) : vm_qmp_peer($id); - - my $machine_version; - if ($options->{qsd}) { # qemu-storage-daemon runs with the installed binary version - $machine_version = - 'pc-i440fx-' . PVE::QemuServer::Machine::latest_installed_machine_version(); - } else { - $machine_version = PVE::QemuServer::Machine::get_current_qemu_machine($id); - } - - my $blockdev = generate_drive_blockdev($storecfg, $drive, $machine_version, $options); + my ($blockdev, $qmp_peer) = generate_drive_blockdev_for_peer($storecfg, $id, $drive, $options); my $throttle_group_id; if (parse_top_node_name($blockdev->{'node-name'})) { # device top nodes need a throttle group @@ -713,6 +730,35 @@ sub detach_fleecing_block_nodes { } } +=pod + +=head3 reopen + + reopen($storecfg, $id, $drive, $options); + +Re-open the already attached drive C<$drive> of the VM C<$id> while considering the additional +options C<$options>. See C for the description of parameters and options. The C +option is currently required to be set. + +=cut + +sub reopen { + my ($storecfg, $id, $drive, $options) = @_; + + # Will need additional consideration regarding the throttle group objects. + die "reopen for a throttle node is not implemented yet\n" if !$options->{'no-throttle'}; + + my ($blockdev, $qmp_peer) = generate_drive_blockdev_for_peer($storecfg, $id, $drive, $options); + + if ($blockdev->{driver} eq 'zeroinit') { # zero-init does not support re-open, defer to child + $blockdev = $blockdev->{file}; + } + + qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$blockdev]); + + return; +} + sub resize { my ($vmid, $deviceid, $storecfg, $volid, $size) = @_; -- 2.47.3