[pve-devel] [PATCH qemu-server v4 1/2] cd rom handling: return a clearer error when there is no cd rom drive

[pve-devel] [PATCH qemu-server v4 1/2] cd rom handling: return a clearer error when there is no cd rom drive

[Stefan Sterz]

when a vm is configured to use a physical cd rom drive but there is no
such drive a cryptic "uninitialized value" error is thrown. this is
due to `$path` being undefined in `sub print_drive_commandline_full`.
warn that no cd rom drive is available instead.

note that the error was cosmetic as the vm would start just fine.

forum thread: https://forum.proxmox.com/threads/119592/

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
changes from v3 (thanks @ Thomas Lamprecht):

* use `log_warn` instead of `warn`
* dont return results of assignments

changes from v2 (thanks @ Fiona Ebner):

* added newline to message
* cache the fact that no drive is available so we warn only once
* adjusted error message again

changes from v1: 

* make the error message more concise. 
* use shorter forum link for better formatting in commit message 
  (thanks @ Fiona Ebner).


 PVE/QemuServer.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 39fc6b0..3837bd9 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1287,11 +1287,16 @@ sub option_exists {
 my $cdrom_path;
 sub get_cdrom_path {
 
-    return  $cdrom_path if $cdrom_path;
+    return $cdrom_path if defined($cdrom_path);
 
     return $cdrom_path = "/dev/cdrom" if -l "/dev/cdrom";
     return $cdrom_path = "/dev/cdrom1" if -l "/dev/cdrom1";
     return $cdrom_path = "/dev/cdrom2" if -l "/dev/cdrom2";
+
+    log_warn("no physical CD-ROM available, ignoring");
+    $cdrom_path = '';
+
+    return $cdrom_path;
 }
 
 sub get_iso_path {
-- 
2.30.2

[pve-devel] [PATCH qemu-server v4 2/2] cd rom handling: refactor cd rom path helper function

[Stefan Sterz]

to stop returning results of assignments

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
drop this if unwanted/unneeded

 PVE/QemuServer.pm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 3837bd9..8d8252d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1289,12 +1289,16 @@ sub get_cdrom_path {
 
     return $cdrom_path if defined($cdrom_path);
 
-    return $cdrom_path = "/dev/cdrom" if -l "/dev/cdrom";
-    return $cdrom_path = "/dev/cdrom1" if -l "/dev/cdrom1";
-    return $cdrom_path = "/dev/cdrom2" if -l "/dev/cdrom2";
-
-    log_warn("no physical CD-ROM available, ignoring");
-    $cdrom_path = '';
+    if (-l "/dev/cdrom") {
+	$cdrom_path = "/dev/cdrom";
+    } elsif (-l "/dev/cdrom1") {
+	$cdrom_path = "/dev/cdrom1";
+    } elsif (-l "/dev/cdrom2") {
+	$cdrom_path = "/dev/cdrom2";
+    } else {
+	log_warn("no physical CD-ROM available, ignoring");
+	$cdrom_path = '';
+    }
 
     return $cdrom_path;
 }
-- 
2.30.2

[pve-devel] applied: [PATCH qemu-server v4 1/2] cd rom handling: return a clearer error when there is no cd rom drive

[Thomas Lamprecht]

Am 20/12/2022 um 11:30 schrieb Stefan Sterz:
> when a vm is configured to use a physical cd rom drive but there is no
> such drive a cryptic "uninitialized value" error is thrown. this is
> due to `$path` being undefined in `sub print_drive_commandline_full`.
> warn that no cd rom drive is available instead.
> 
> note that the error was cosmetic as the vm would start just fine.
> 
> forum thread: https://forum.proxmox.com/threads/119592/
> 
> Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
> ---
> changes from v3 (thanks @ Thomas Lamprecht):
> 
> * use `log_warn` instead of `warn`
> * dont return results of assignments
> 
> changes from v2 (thanks @ Fiona Ebner):
> 
> * added newline to message
> * cache the fact that no drive is available so we warn only once
> * adjusted error message again
> 
> changes from v1: 
> 
> * make the error message more concise. 
> * use shorter forum link for better formatting in commit message 
>   (thanks @ Fiona Ebner).
> 
> 
>  PVE/QemuServer.pm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
>

applied both patches, thanks!