all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Sterz <s.sterz@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v4 2/2] cd rom handling: refactor cd rom path helper function
Date: Tue, 20 Dec 2022 11:30:37 +0100	[thread overview]
Message-ID: <20221220103037.890813-2-s.sterz@proxmox.com> (raw)
In-Reply-To: <20221220103037.890813-1-s.sterz@proxmox.com>

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





  reply	other threads:[~2022-12-20 10:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-20 10:30 [pve-devel] [PATCH qemu-server v4 1/2] cd rom handling: return a clearer error when there is no cd rom drive Stefan Sterz
2022-12-20 10:30 ` Stefan Sterz [this message]
2023-01-13 12:53 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221220103037.890813-2-s.sterz@proxmox.com \
    --to=s.sterz@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal