Rename disksize to bootdisk_size and print_drive_full to print_drive_commandline_full

to avoid confusion with print_drive

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 53aec189cef35fe0df91f65faeb05a4d3af1e3a0..0a0475be540bad9f1016dcc0a5ed5d92dcfb8c94 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1449,7 +1449,7 @@ sub get_initiator_name {
     return $initiator;
 }
 
-sub print_drive_full {
+sub print_drive_commandline_full {
     my ($storecfg, $vmid, $drive) = @_;
 
     my $path;
@@ -2509,7 +2509,7 @@ sub vmstatus {
        # fixme: better status?
        $d->{status} = $list->{$vmid}->{pid} ? 'running' : 'stopped';
 
-       my $size = PVE::QemuServer::Drive::disksize($storecfg, $conf);
+       my $size = PVE::QemuServer::Drive::bootdisk_size($storecfg, $conf);
        if (defined($size)) {
            $d->{disk} = 0; # no info available
            $d->{maxdisk} = $size;
@@ -3480,7 +3480,7 @@ sub config_to_command {
            $ahcicontroller->{$controller}=1;
         }
 
-       my $drive_cmd = print_drive_full($storecfg, $vmid, $drive);
+       my $drive_cmd = print_drive_commandline_full($storecfg, $vmid, $drive);
        push @$devices, '-drive',$drive_cmd;
        push @$devices, '-device', print_drivedevice_full($storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type);
     });
@@ -3862,7 +3862,7 @@ sub qemu_objectdel {
 sub qemu_driveadd {
     my ($storecfg, $vmid, $device) = @_;
 
-    my $drive = print_drive_full($storecfg, $vmid, $device);
+    my $drive = print_drive_commandline_full($storecfg, $vmid, $device);
     $drive =~ s/\\/\\\\/g;
     my $ret = PVE::QemuServer::Monitor::hmp_cmd($vmid, "drive_add auto \"$drive\"");
 

diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm
index ec4b6caf703fbd1d54c9c50a9aa215361477885c..1af1d361509deb11f73a4488cb7455ffe8c17938 100644 (file)
--- a/PVE/QemuServer/Drive.pm
+++ b/PVE/QemuServer/Drive.pm
@@ -547,7 +547,7 @@ sub foreach_volid {
     }
 }
 
-sub disksize {
+sub bootdisk_size {
     my ($storecfg, $conf) = @_;
 
     my $bootdisk = $conf->{bootdisk};