From 75748d4492e76c003bcaa9985b7eca7f4f7d699a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 4 Jun 2021 11:47:44 +0200 Subject: [PATCH] drive: factor out read-only helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 7572db94..d89c3be8 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); @@ -3679,11 +3679,7 @@ sub config_to_command { $storecfg, $vmid, $drive, $pbs_name, min_version($kvmver, 6, 0)); # 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 82a6bfe5..51101904 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]