From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CD0D974F7E for ; Fri, 4 Jun 2021 11:48:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A6311B2D1 for ; Fri, 4 Jun 2021 11:48:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D60C81B2C5 for ; Fri, 4 Jun 2021 11:48:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B0779465D2 for ; Fri, 4 Jun 2021 11:48:01 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 11:47:44 +0200 Message-Id: <20210604094748.3383339-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604094748.3383339-1-f.gruenbichler@proxmox.com> References: <20210604094748.3383339-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, drive.pm] Subject: [pve-devel] [PATCH qemu-server 2/6] drive: factor out 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: , X-List-Received-Date: Fri, 04 Jun 2021 09:48:34 -0000 we also need it for efidisks. Signed-off-by: Fabian Grünbichler --- PVE/QemuServer.pm | 8 ++------ PVE/QemuServer/Drive.pm | 10 ++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 25ac052..0d49415 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -48,7 +48,7 @@ use PVE::QemuServer::Helpers qw(min_version config_aware_timeout); use PVE::QemuServer::Cloudinit; use PVE::QemuServer::CGroup; use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options); -use PVE::QemuServer::Drive qw(is_valid_drivename drive_is_cloudinit drive_is_cdrom parse_drive print_drive); +use PVE::QemuServer::Drive qw(is_valid_drivename drive_is_cloudinit drive_is_cdrom drive_is_read_only parse_drive print_drive); use PVE::QemuServer::Machine; use PVE::QemuServer::Memory; use PVE::QemuServer::Monitor qw(mon_cmd); @@ -3662,11 +3662,7 @@ sub config_to_command { my $drive_cmd = print_drive_commandline_full($storecfg, $vmid, $drive, $pbs_name); # extra protection for templates, but SATA and IDE don't support it.. - my $read_only = PVE::QemuConfig->is_template($conf) - && $drive->{interface} ne 'sata' - && $drive->{interface} ne 'ide'; - - $drive_cmd .= ',readonly=on' if $read_only; + $drive_cmd .= ',readonly=on' if drive_is_read_only($conf, $drive); push @$devices, '-drive',$drive_cmd; push @$devices, '-device', print_drivedevice_full( diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 146a4ab..0408e32 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -12,6 +12,7 @@ our @EXPORT_OK = qw( is_valid_drivename drive_is_cloudinit drive_is_cdrom +drive_is_read_only parse_drive print_drive ); @@ -422,6 +423,15 @@ 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'; +} + # ideX = [volume=]volume-id[,media=d][,cyls=c,heads=h,secs=s[,trans=t]] # [,snapshot=on|off][,cache=on|off][,format=f][,backup=yes|no] # [,rerror=ignore|report|stop][,werror=enospc|ignore|report|stop] -- 2.30.2