Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-03-08 04:58:26 +03:00
Code Releases Activity

Rename disksize to bootdisk_size and print_drive_full to print_drive_commandline_full

Browse Source 
to avoid confusion with print_drive

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-03-02 11:33:45 +01:00 committed by Thomas Lamprecht
parent e0fd2b2f84
commit 776c5f5067
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer.pm
View File

@ -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\"");

2
PVE/QemuServer/Drive.pm
View File

@ -547,7 +547,7 @@ sub foreach_volid {
}
}
sub disksize {
sub bootdisk_size {
my ($storecfg, $conf) = @_;
my $bootdisk = $conf->{bootdisk};