[pve-devel] [PATCH qemu-server v2 04/32] drive: code cleanup: drop unused $vmid parameter from get_path_and_format()

[Fiona Ebner]

The parameter is unused since commit f97b3da1 ("drive: code cleanup:
remove unused $vmid argument from get_iso_path() helper").

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---

No changes in v2.

 src/PVE/QemuServer.pm       | 6 +++---
 src/PVE/QemuServer/Drive.pm | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 8eecbd53..89dd7065 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -1538,7 +1538,7 @@ sub print_drive_commandline_full {
     my $vtype = $storeid ? (PVE::Storage::parse_volname($storecfg, $drive->{file}))[0] : undef;
 
     my ($path, $format) =
-        PVE::QemuServer::Drive::get_path_and_format($storecfg, $vmid, $drive, $live_restore_name);
+        PVE::QemuServer::Drive::get_path_and_format($storecfg, $drive, $live_restore_name);
 
     my $is_rbd = $path =~ m/^rbd:/;
 
@@ -5775,7 +5775,7 @@ sub vmconfig_update_disk {
                 }
             } else {
                 my ($path, $format) =
-                    PVE::QemuServer::Drive::get_path_and_format($storecfg, $vmid, $drive);
+                    PVE::QemuServer::Drive::get_path_and_format($storecfg, $drive);
 
                 # force eject if locked
                 mon_cmd($vmid, "eject", force => JSON::true, id => "$opt");
@@ -5828,7 +5828,7 @@ sub vmconfig_update_cloudinit_drive {
 
     if ($running) {
         my ($path, $format) =
-            PVE::QemuServer::Drive::get_path_and_format($storecfg, $vmid, $cloudinit_drive);
+            PVE::QemuServer::Drive::get_path_and_format($storecfg, $cloudinit_drive);
         if ($path) {
             mon_cmd($vmid, "eject", force => JSON::true, id => "$cloudinit_ds");
             mon_cmd(
diff --git a/src/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm
index f6351a98..0947b9ed 100644
--- a/src/PVE/QemuServer/Drive.pm
+++ b/src/PVE/QemuServer/Drive.pm
@@ -107,7 +107,7 @@ sub get_iso_path {
 # Returns the path that can be used on the QEMU commandline and in QMP commands as well as the
 # checked format of the drive.
 sub get_path_and_format {
-    my ($storecfg, $vmid, $drive, $live_restore_name) = @_;
+    my ($storecfg, $drive, $live_restore_name) = @_;
 
     my $path;
     my $volid = $drive->{file};
-- 
2.39.5