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 5BAAE1FF17A for ; Tue, 14 Oct 2025 16:41:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 135447BDE; Tue, 14 Oct 2025 16:40:31 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 14 Oct 2025 16:39:23 +0200 Message-ID: <20251014143946.160679-13-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014143946.160679-1-f.ebner@proxmox.com> References: <20251014143946.160679-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760452753016 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 12/16] blockdev: support attaching to qemu-storage-daemon 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" The qemu-storage-daemon runs with the installed binary version, so the machine type should be set accordingly. All that needs to be changed is the peer for QMP communication. Adds an export for the qmp_cmd() subroutine. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 27 +++++++++++++++++++-------- src/PVE/QemuServer/Monitor.pm | 1 + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index 8fa5eb51..d08a4855 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -16,7 +16,7 @@ use PVE::QemuServer::BlockJob; use PVE::QemuServer::Drive qw(drive_is_cdrom); use PVE::QemuServer::Helpers; use PVE::QemuServer::Machine; -use PVE::QemuServer::Monitor qw(mon_cmd); +use PVE::QemuServer::Monitor qw(mon_cmd qmp_cmd); # gives ($host, $port, $export) my $NBD_TCP_PATH_RE_3 = qr/nbd:(\S+):(\d+):exportname=(\S+)/; @@ -513,9 +513,9 @@ sub generate_pbs_blockdev { } my sub blockdev_add { - my ($vmid, $blockdev) = @_; + my ($qmp_peer, $blockdev) = @_; - eval { mon_cmd($vmid, 'blockdev-add', $blockdev->%*); }; + eval { qmp_cmd($qmp_peer, 'blockdev-add', $blockdev->%*); }; if (my $err = $@) { my $node_name = $blockdev->{'node-name'} // 'undefined'; die "adding blockdev '$node_name' failed : $err\n" if $@; @@ -563,6 +563,9 @@ rather than the volume itself. =item C<< $options->{'tpm-backup'} >>: Generate and attach a block device for backing up the TPM state image. +=item C<< $options->{'qsd'} >>: Rather than attaching to the VM itself, attach to the QEMU storage +daemon associated to the VM. + =back =back @@ -572,7 +575,15 @@ state image. sub attach { my ($storecfg, $vmid, $drive, $options) = @_; - my $machine_version = PVE::QemuServer::Machine::get_current_qemu_machine($vmid); + my $qmp_peer = { vmid => $vmid, type => $options->{qsd} ? 'qsd' : 'qmp' }; + + 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($vmid); + } my $blockdev = generate_drive_blockdev($storecfg, $drive, $machine_version, $options); @@ -585,17 +596,17 @@ sub attach { eval { if ($throttle_group_id) { # Try to remove potential left-over. - mon_cmd($vmid, 'object-del', id => $throttle_group_id, noerr => 1); + qmp_cmd($qmp_peer, 'object-del', id => $throttle_group_id, noerr => 1); my $throttle_group = generate_throttle_group($drive); - mon_cmd($vmid, 'object-add', $throttle_group->%*); + qmp_cmd($qmp_peer, 'object-add', $throttle_group->%*); } - blockdev_add($vmid, $blockdev); + blockdev_add($qmp_peer, $blockdev); }; if (my $err = $@) { if ($throttle_group_id) { - eval { mon_cmd($vmid, 'object-del', id => $throttle_group_id); }; + eval { qmp_cmd($qmp_peer, 'object-del', id => $throttle_group_id); }; } die $err; } diff --git a/src/PVE/QemuServer/Monitor.pm b/src/PVE/QemuServer/Monitor.pm index 0b15808b..9a66d142 100644 --- a/src/PVE/QemuServer/Monitor.pm +++ b/src/PVE/QemuServer/Monitor.pm @@ -10,6 +10,7 @@ use PVE::QMPClient; use base 'Exporter'; our @EXPORT_OK = qw( mon_cmd + qmp_cmd ); =head3 qmp_cmd -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel