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 3B7241FF13C for ; Thu, 19 Feb 2026 11:48:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C29A410CD4; Thu, 19 Feb 2026 11:49:18 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: applied: [PATCH qemu-server] config: use drive_is_cdrom() helper from drive module directly Date: Thu, 19 Feb 2026 11:47:55 +0100 Message-ID: <20260219104839.47891-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771498113369 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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 Message-ID-Hash: VYGNJ4L3BRROXMIE4LB2X2NYUT5UBMSF X-Message-ID-Hash: VYGNJ4L3BRROXMIE4LB2X2NYUT5UBMSF 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: Do not use the drive_is_cdrom() helper that the QemuServer module imports. Get rid of this pseudo-dependency from the QemuConfig module to the QemuServer module. Signed-off-by: Fiona Ebner --- src/PVE/QemuConfig.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index 844ed69a..67dec91b 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -80,7 +80,7 @@ sub has_feature { sub { my ($ds, $drive) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); return if $backup_only && defined($drive->{backup}) && !$drive->{backup}; my $volid = $drive->{file}; $err = 1 @@ -186,7 +186,7 @@ sub get_backup_volumes { my $test_volume = sub { my ($key, $drive) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $included = $drive->{backup} // 1; my $reason = "backup="; @@ -274,7 +274,7 @@ sub __snapshot_activate_storages { sub { my ($key, $drive) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my ($storeid) = PVE::Storage::parse_volume_id($drive->{file}); $storage_hash->{$storeid} = 1; @@ -392,7 +392,7 @@ sub __snapshot_create_vol_snapshots_hook { sub __snapshot_create_vol_snapshot { my ($class, $vmid, $ds, $drive, $snapname) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $volid = $drive->{file}; my $device = "drive-$ds"; @@ -410,7 +410,7 @@ sub __snapshot_delete_remove_drive { delete $snap->{$remove_drive}; } else { my $drive = PVE::QemuServer::parse_drive($remove_drive, $snap->{$remove_drive}); - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $volid = $drive->{file}; delete $snap->{$remove_drive}; @@ -433,7 +433,7 @@ sub __snapshot_delete_vmstate_file { sub __snapshot_delete_vol_snapshot { my ($class, $vmid, $ds, $drive, $snapname, $unused) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $storecfg = PVE::Storage::config(); my $volid = $drive->{file}; @@ -486,7 +486,7 @@ sub __snapshot_rollback_hook { sub __snapshot_rollback_vol_possible { my ($class, $drive, $snapname, $blockers) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $storecfg = PVE::Storage::config(); my $volid = $drive->{file}; @@ -497,7 +497,7 @@ sub __snapshot_rollback_vol_possible { sub __snapshot_rollback_vol_rollback { my ($class, $drive, $snapname) = @_; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive); my $storecfg = PVE::Storage::config(); PVE::Storage::volume_snapshot_rollback($storecfg, $drive->{file}, $snapname); @@ -533,7 +533,7 @@ sub __snapshot_rollback_get_unused { sub { my ($vs, $volume) = @_; - return if PVE::QemuServer::drive_is_cdrom($volume, 1); + return if PVE::QemuServer::Drive::drive_is_cdrom($volume, 1); my $found = 0; my $volid = $volume->{file}; @@ -544,7 +544,7 @@ sub __snapshot_rollback_get_unused { my ($ds, $drive) = @_; return if $found; - return if PVE::QemuServer::drive_is_cdrom($drive, 1); + return if PVE::QemuServer::Drive::drive_is_cdrom($drive, 1); $found = 1 if ($drive->{file} && $drive->{file} eq $volid); -- 2.47.3