From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 05/31] blockdev: add helpers for attaching and detaching block devices
Date: Fri, 27 Jun 2025 17:57:01 +0200 [thread overview]
Message-ID: <20250627155737.162083-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20250627155737.162083-1-f.ebner@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/QemuServer/Blockdev.pm | 132 +++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm
index 6e6b9245..26d70eee 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -11,6 +11,7 @@ use PVE::JSONSchema qw(json_bool);
use PVE::Storage;
use PVE::QemuServer::Drive qw(drive_is_cdrom);
+use PVE::QemuServer::Monitor qw(mon_cmd);
my sub get_node_name {
my ($type, $drive_id, $volid, $snap) = @_;
@@ -221,4 +222,135 @@ sub generate_drive_blockdev {
};
}
+my sub blockdev_add {
+ my ($vmid, $blockdev) = @_;
+
+ eval { mon_cmd($vmid, 'blockdev-add', $blockdev->%*); };
+ if (my $err = $@) {
+ my $node_name = $blockdev->{'node-name'} // 'undefined';
+ die "adding blockdev '$node_name' failed : $err\n" if $@;
+ }
+
+ return;
+}
+
+=pod
+
+=head3 attach
+
+ attach($storecfg, $vmid, $drive, $options);
+
+Attach the drive C<$drive> to the VM C<$vmid> considering the additional options C<$options>.
+
+Parameters:
+
+=over
+
+=item C<$storecfg>
+
+The storage configuration.
+
+=item C<$vmid>
+
+The ID of the virtual machine.
+
+=item C<$drive>
+
+The drive as parsed from a virtual machine configuration.
+
+=item C<$options>
+
+A hash reference with additional options.
+
+=over
+
+=item C<< $options->{'read-only'} >>
+
+Attach the image as read-only irrespective of the configuration in C<$drive>.
+
+=item C<< $options->{size} >>
+
+Attach the image with this virtual size. Must be smaller than the actual size of the image. The
+image format must be C<raw>.
+
+=item C<< $options->{'snapshot-name'} >>
+
+Attach this snapshot of the volume C<< $drive->{file} >>, rather than the volume itself.
+
+=back
+
+=back
+
+=cut
+
+sub attach {
+ my ($storecfg, $vmid, $drive, $options) = @_;
+
+ my $blockdev = generate_drive_blockdev($storecfg, $drive, $options);
+
+ my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
+ if ($blockdev->{'node-name'} eq "drive-$drive_id") { # device top nodes need a throttle group
+ my $throttle_group = generate_throttle_group($drive);
+ mon_cmd($vmid, 'object-add', $throttle_group->%*);
+ }
+
+ eval { blockdev_add($vmid, $blockdev); };
+ if (my $err = $@) {
+ eval { mon_cmd($vmid, 'object-del', id => "throttle-drive-$drive_id"); };
+ warn $@ if $@;
+ die $err;
+ }
+
+ return;
+}
+
+=pod
+
+=head3 detach
+
+ detach($vmid, $node_name);
+
+Detach the block device C<$node_name> from the VM C<$vmid>. Also removes associated child block
+nodes.
+
+Parameters:
+
+=over
+
+=item C<$vmid>
+
+The ID of the virtual machine.
+
+=item C<$node_name>
+
+The node name identifying the block node in QEMU.
+
+=back
+
+=cut
+
+sub detach {
+ my ($vmid, $node_name) = @_;
+
+ die "Blockdev::detach - no node name\n" if !$node_name;
+
+ # QEMU recursively auto-removes the file children, i.e. file and format node below the top
+ # node and also implicit backing children referenced by a qcow2 image.
+ eval { mon_cmd($vmid, 'blockdev-del', 'node-name' => "$node_name"); };
+ if (my $err = $@) {
+ return if $err =~ m/Failed to find node with node-name/; # already gone
+ die "deleting blockdev '$node_name' failed : $err\n";
+ }
+
+ if ($node_name =~ m/^drive-(.+)$/) {
+ # also remove throttle group if it was a device top node
+ my $drive_id = $1;
+ if (PVE::QemuServer::Drive::is_valid_drivename($drive_id)) {
+ mon_cmd($vmid, 'object-del', id => "throttle-drive-$drive_id");
+ }
+ }
+
+ return;
+}
+
1;
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-06-27 15:58 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-27 15:56 [pve-devel] [PATCH-SERIES qemu-server 00/31] let's switch to blockdev, blockdev, blockdev, part four (final) Fiona Ebner
2025-06-27 15:56 ` [pve-devel] [PATCH qemu-server 01/31] mirror: code style: avoid masking earlier declaration of $op Fiona Ebner
2025-06-27 15:56 ` [pve-devel] [PATCH qemu-server 02/31] test: collect mocked functions for QemuServer module Fiona Ebner
2025-06-27 15:56 ` [pve-devel] [PATCH qemu-server 03/31] drive: add helper to parse drive interface Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 04/31] drive: drop invalid export of get_scsi_devicetype Fiona Ebner
2025-06-27 15:57 ` Fiona Ebner [this message]
2025-06-30 10:15 ` [pve-devel] [PATCH qemu-server 05/31] blockdev: add helpers for attaching and detaching block devices Fabian Grünbichler
2025-06-30 10:35 ` DERUMIER, Alexandre via pve-devel
[not found] ` <6575d8fe67659098d2bbd533c9063bcbd44c0a21.camel@groupe-cyllene.com>
2025-06-30 11:43 ` DERUMIER, Alexandre via pve-devel
2025-06-30 11:58 ` Fiona Ebner
2025-06-30 11:45 ` Fiona Ebner
2025-06-30 11:55 ` Fabian Grünbichler
2025-06-30 15:11 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 06/31] blockdev: add missing include for JSON module Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 07/31] backup: use blockdev for fleecing images Fiona Ebner
2025-06-30 10:15 ` Fabian Grünbichler
2025-07-01 8:20 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 08/31] backup: use blockdev for TPM state file Fiona Ebner
2025-06-30 10:15 ` Fabian Grünbichler
2025-07-01 8:22 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 09/31] blockdev: introduce qdev_id_to_drive_id() helper Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 10/31] blockdev: introduce and use get_block_info() helper Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 11/31] blockdev: move helper for resize into module Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 12/31] blockdev: add helper to get node below throttle node Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 13/31] blockdev: resize: query and use node name for resize operation Fiona Ebner
2025-06-30 6:23 ` DERUMIER, Alexandre via pve-devel
2025-06-30 7:52 ` Fiona Ebner
2025-06-30 11:38 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 14/31] blockdev: support using zeroinit filter Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 15/31] blockdev: make some functions private Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 16/31] block job: allow specifying a block node that should be detached upon completion Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 17/31] block job: add blockdev mirror Fiona Ebner
2025-06-30 10:15 ` Fabian Grünbichler
2025-07-01 9:21 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 18/31] blockdev: add change_medium() helper Fiona Ebner
2025-06-30 14:29 ` DERUMIER, Alexandre via pve-devel
[not found] ` <cd933fed020383019705045025d38c509042c267.camel@groupe-cyllene.com>
2025-06-30 14:42 ` DERUMIER, Alexandre via pve-devel
2025-07-01 7:30 ` DERUMIER, Alexandre via pve-devel
2025-07-01 8:38 ` Fabian Grünbichler
2025-07-01 10:01 ` DERUMIER, Alexandre via pve-devel
2025-07-01 8:42 ` Fiona Ebner
2025-07-01 10:05 ` Fiona Ebner
2025-07-01 10:20 ` DERUMIER, Alexandre via pve-devel
2025-07-01 10:25 ` Fiona Ebner
2025-07-01 11:51 ` DERUMIER, Alexandre via pve-devel
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 19/31] blockdev: add blockdev_change_medium() helper Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 20/31] blockdev: move helper for configuring throttle limits to module Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 21/31] clone disk: skip check for aio=default (io_uring) compatibility starting with machine version 10.0 Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 22/31] print drive device: don't reference any drive for 'none' " Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 23/31] blockdev: add support for NBD paths Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 24/31] blockdev: add helper to generate PBS block device for live restore Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 25/31] blockdev: support alloc-track driver for live-{import, restore} Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 26/31] live import: also record volid information Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 27/31] live import/restore: query which node to use for operation Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 28/31] live import/restore: use Blockdev::detach helper Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 29/31] command line: switch to blockdev starting with machine version 10.0 Fiona Ebner
2025-06-30 10:15 ` Fabian Grünbichler
2025-06-30 10:57 ` Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 30/31] test: migration: update running machine to 10.0 Fiona Ebner
2025-06-27 15:57 ` [pve-devel] [PATCH qemu-server 31/31] partially fix #3227: ensure that target image for mirror has the same size for EFI disks Fiona Ebner
2025-06-27 16:00 ` [pve-devel] [PATCH-SERIES qemu-server 00/31] let's switch to blockdev, blockdev, blockdev, part four (final) Fiona Ebner
2025-06-30 8:19 ` DERUMIER, Alexandre via pve-devel
2025-06-30 8:24 ` Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250627155737.162083-6-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox