From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8096A1FF170 for ; Thu, 24 Jul 2025 15:59:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B742B3B150; Thu, 24 Jul 2025 16:00:34 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 24 Jul 2025 15:59:40 +0200 Message-ID: <20250724135956.112138-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250724135956.112138-1-f.ebner@proxmox.com> References: <20250724135956.112138-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753365598425 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 1/6] blockdev: helper to add common options 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" Certain options like read-only need to be set on all nodes in the throttle->fmt->file chain to apply correctly and consistently. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index 28453b48..822543cd 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -186,6 +186,13 @@ my sub read_only_json_option { return json_bool($drive->{ro} || drive_is_cdrom($drive) || $options->{'read-only'}); } +# Common blockdev options that need to be set across the whole throttle->fmt->file chain. +my sub add_common_options { + my ($blockdev, $drive, $options) = @_; + + $blockdev->{'read-only'} = read_only_json_option($drive, $options); +} + my sub throttle_group_id { my ($drive_id) = @_; @@ -314,7 +321,7 @@ my sub generate_file_blockdev { $blockdev->{'node-name'} = get_node_name('file', $drive_id, $drive->{file}, $options); - $blockdev->{'read-only'} = read_only_json_option($drive, $options); + add_common_options($blockdev, $drive, $options); return $blockdev; } @@ -356,9 +363,10 @@ my sub generate_format_blockdev { driver => "$format", file => $child, cache => $child->{cache}, # define cache option on both format && file node like libvirt - 'read-only' => read_only_json_option($drive, $options), }; + add_common_options($blockdev, $drive, $options); + if (defined($options->{size})) { die "blockdev: 'size' is only supported for 'raw' format" if $format ne 'raw'; $blockdev->{size} = int($options->{size}); @@ -411,13 +419,16 @@ sub generate_throttle_blockdev { my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive); - return { + my $blockdev = { driver => "throttle", 'node-name' => top_node_name($drive_id), 'throttle-group' => throttle_group_id($drive_id), file => $child, - 'read-only' => read_only_json_option($drive, $options), }; + + add_common_options($blockdev, $drive, $options); + + return $blockdev; } sub generate_drive_blockdev { -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel