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 E55631FF16B for ; Tue, 12 Aug 2025 16:37:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6B8631038B; Tue, 12 Aug 2025 16:39:37 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 12 Aug 2025 16:37:42 +0200 Message-ID: <20250812143900.138723-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812143900.138723-1-f.ebner@proxmox.com> References: <20250812143900.138723-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755009513486 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [drive.pm, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server v2 4/5] code cleanup: drive: get rid of outdated drive_is_read_only() helper 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 drive_is_read_only() helper only applies to '-drive', but not '-blockdev' and is only used in a single place. Inline it to avoid accidental usages popping up in the future. This also gets rid of a hidden dependency from Drive to QemuConfig. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 7 ++++--- src/PVE/QemuServer/Drive.pm | 10 ---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index d3f0c589..aacdadad 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -67,7 +67,6 @@ use PVE::QemuServer::Drive qw( checked_volume_format drive_is_cloudinit drive_is_cdrom - drive_is_read_only parse_drive print_drive storage_allows_io_uring_default @@ -3778,8 +3777,10 @@ sub config_to_command { my $drive_cmd = print_drive_commandline_full($storecfg, $vmid, $drive, $live_blockdev_name); - # extra protection for templates, but SATA and IDE don't support it.. - $drive_cmd .= ',readonly=on' if drive_is_read_only($conf, $drive); + if ($is_template) { + my $interface = $drive->{interface}; + $drive_cmd .= ',readonly=on' if $interface ne 'ide' && $interface ne 'sata'; + } push @$devices, '-drive', $drive_cmd; } diff --git a/src/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm index 9dc4e674..79dd22e6 100644 --- a/src/PVE/QemuServer/Drive.pm +++ b/src/PVE/QemuServer/Drive.pm @@ -20,7 +20,6 @@ our @EXPORT_OK = qw( checked_volume_format drive_is_cloudinit drive_is_cdrom - drive_is_read_only parse_drive print_drive storage_allows_io_uring_default @@ -751,15 +750,6 @@ sub drive_is_cdrom { return $drive && $drive->{media} && ($drive->{media} eq 'cdrom'); } -sub drive_is_read_only { - my ($conf, $drive) = @_; - - return 0 if !PVE::QemuConfig->is_template($conf); - - # don't support being marked read-only - return $drive->{interface} ne 'sata' && $drive->{interface} ne 'ide'; -} - sub parse_drive_interface { my ($key) = @_; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel