From 9f95aa78c7384ec72a3ed344a77f7629a7951516 Mon Sep 17 00:00:00 2001
From: Fiona Ebner <f.ebner@proxmox.com>
Date: Fri, 17 Jan 2025 12:54:32 +0100
Subject: [PATCH] move get_drive_id() helper to drive module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No functional change intended.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Friedrich Weber <f.weber@proxmox.com>
---
 PVE/QemuServer.pm       | 9 ++-------
 PVE/QemuServer/Drive.pm | 5 +++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b19bd86b..50b1e29c 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1319,18 +1319,13 @@ sub print_keyboarddevice_full {
     return "usb-kbd,id=keyboard,bus=ehci.0,port=2";
 }
 
-my sub get_drive_id {
-    my ($drive) = @_;
-    return "$drive->{interface}$drive->{index}";
-}
-
 sub print_drivedevice_full {
     my ($storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type) = @_;
 
     my $device = '';
     my $maxdev = 0;
 
-    my $drive_id = get_drive_id($drive);
+    my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
     if ($drive->{interface} eq 'virtio') {
 	my $pciaddr = print_pci_addr("$drive_id", $bridges, $arch, $machine_type);
 	$device = "virtio-blk-pci,drive=drive-$drive_id,id=${drive_id}${pciaddr}";
@@ -1470,7 +1465,7 @@ sub print_drive_commandline_full {
 
     my $path;
     my $volid = $drive->{file};
-    my $drive_id = get_drive_id($drive);
+    my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
 
     my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
     my $scfg = $storeid ? PVE::Storage::storage_config($storecfg, $storeid) : undef;
diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm
index 94d27a55..c28951d8 100644
--- a/PVE/QemuServer/Drive.pm
+++ b/PVE/QemuServer/Drive.pm
@@ -748,6 +748,11 @@ sub print_drive {
     return PVE::JSONSchema::print_property_string($drive, $fmt, $skip);
 }
 
+sub get_drive_id {
+    my ($drive) = @_;
+    return "$drive->{interface}$drive->{index}";
+}
+
 sub get_bootdisks {
     my ($conf) = @_;