proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-30 00:30:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove $vmid param from print_drive

Browse Source 
It isn't used in the sub, but suggest it is needed. No users outside
qemu-server found.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2019-12-05 16:11:01 +01:00 committed by Thomas Lamprecht
parent 6db4c69e1d
commit 71c58bb7ed
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/API2/Qemu.pm
View File

@ -147,7 +147,7 @@ my $create_disks = sub {
if (!$volid || $volid eq 'none' || $volid eq 'cdrom') { if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
delete $disk->{size}; delete $disk->{size};
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($disk);
} elsif (defined($volname) && $volname eq 'cloudinit') { } elsif (defined($volname) && $volname eq 'cloudinit') {
$storeid = $storeid // $default_storage; $storeid = $storeid // $default_storage;
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
@ -169,7 +169,7 @@ my $create_disks = sub {
$disk->{media} = 'cdrom'; $disk->{media} = 'cdrom';
push @$vollist, $volid; push @$vollist, $volid;
delete $disk->{format}; # no longer needed delete $disk->{format}; # no longer needed
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($disk);
} elsif ($volid =~ $NEW_DISK_RE) { } elsif ($volid =~ $NEW_DISK_RE) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
@ -188,7 +188,7 @@ my $create_disks = sub {
$disk->{file} = $volid; $disk->{file} = $volid;
$disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b'); $disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b');
delete $disk->{format}; # no longer needed delete $disk->{format}; # no longer needed
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($disk);
} else { } else {
PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid); PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
@ -211,7 +211,7 @@ my $create_disks = sub {
$disk->{size} = $size; $disk->{size} = $size;
} }
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($disk);
} }
}; };
@ -525,7 +525,7 @@ __PACKAGE__->register_method({
raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
$param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive); $param->{$opt} = PVE::QemuServer::print_drive($drive);
} }
} }
@ -1063,7 +1063,7 @@ my $update_vm_api = sub {
raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive); PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
$check_replication->($drive); $check_replication->($drive);
$param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive); $param->{$opt} = PVE::QemuServer::print_drive($drive);
} elsif ($opt =~ m/^net(\d+)$/) { } elsif ($opt =~ m/^net(\d+)$/) {
# add macaddr # add macaddr
my $net = PVE::QemuServer::parse_net($param->{$opt}); my $net = PVE::QemuServer::parse_net($param->{$opt});
@ -2905,7 +2905,7 @@ __PACKAGE__->register_method({
$newid, $storage, $format, $fullclone->{$opt}, $newvollist, $newid, $storage, $format, $fullclone->{$opt}, $newvollist,
$jobs, $skipcomplete, $oldconf->{agent}, $clonelimit); $jobs, $skipcomplete, $oldconf->{agent}, $clonelimit);
$newconf->{$opt} = PVE::QemuServer::print_drive($vmid, $newdrive); $newconf->{$opt} = PVE::QemuServer::print_drive($newdrive);
PVE::QemuConfig->write_config($newid, $newconf); PVE::QemuConfig->write_config($newid, $newconf);
$i++; $i++;
@ -3099,7 +3099,7 @@ __PACKAGE__->register_method({
my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef, my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef,
$vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit); $vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit);
$conf->{$disk} = PVE::QemuServer::print_drive($vmid, $newdrive); $conf->{$disk} = PVE::QemuServer::print_drive($newdrive);
PVE::QemuConfig->add_unused_volume($conf, $old_volid) if !$param->{delete}; PVE::QemuConfig->add_unused_volume($conf, $old_volid) if !$param->{delete};
@ -3589,7 +3589,7 @@ __PACKAGE__->register_method({
PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $newsize); PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $newsize);
$drive->{size} = $newsize; $drive->{size} = $newsize;
$conf->{$disk} = PVE::QemuServer::print_drive($vmid, $drive); $conf->{$disk} = PVE::QemuServer::print_drive($drive);
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
}; };

2
PVE/QemuMigrate.pm
View File

@ -950,7 +950,7 @@ sub phase3_cleanup {
} else { } else {
foreach my $target_drive (keys %{$self->{target_drive}}) { foreach my $target_drive (keys %{$self->{target_drive}}) {
my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{volid}); my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{volid});
$conf->{$target_drive} = PVE::QemuServer::print_drive($vmid, $drive); $conf->{$target_drive} = PVE::QemuServer::print_drive($drive);
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
} }
} }

12
PVE/QemuServer.pm
View File

@ -1751,7 +1751,7 @@ sub parse_drive {
} }
sub print_drive { sub print_drive {
my ($vmid, $drive) = @_; my ($drive) = @_;
my $data = { %$drive }; my $data = { %$drive };
delete $data->{$_} for qw(index interface); delete $data->{$_} for qw(index interface);
return PVE::JSONSchema::print_property_string($data, $alldrive_fmt); return PVE::JSONSchema::print_property_string($data, $alldrive_fmt);
@ -2663,7 +2663,7 @@ sub parse_vm_config {
my $v = parse_drive($key, $value); my $v = parse_drive($key, $value);
if (my $volid = filename_to_volume_id($vmid, $v->{file}, $v->{media})) { if (my $volid = filename_to_volume_id($vmid, $v->{file}, $v->{media})) {
$v->{file} = $volid; $v->{file} = $volid;
$value = print_drive($vmid, $v); $value = print_drive($v);
} else { } else {
warn "vm $vmid - unable to parse value of '$key'\n"; warn "vm $vmid - unable to parse value of '$key'\n";
next; next;
@ -5263,7 +5263,7 @@ sub vm_start {
my $newdrive = $drive; my $newdrive = $drive;
$newdrive->{format} = $format; $newdrive->{format} = $format;
$newdrive->{file} = $newvolid; $newdrive->{file} = $newvolid;
my $drivestr = PVE::QemuServer::print_drive($vmid, $newdrive); my $drivestr = print_drive($newdrive);
$local_volumes->{$opt} = $drivestr; $local_volumes->{$opt} = $drivestr;
#pass drive to conf for command line #pass drive to conf for command line
$conf->{$opt} = $drivestr; $conf->{$opt} = $drivestr;
@ -5971,7 +5971,7 @@ sub restore_update_config_line {
} elsif ($map->{$virtdev}) { } elsif ($map->{$virtdev}) {
delete $di->{format}; # format can change on restore delete $di->{format}; # format can change on restore
$di->{file} = $map->{$virtdev}; $di->{file} = $map->{$virtdev};
$value = print_drive($vmid, $di); $value = print_drive($di);
print $outfd "$virtdev: $value\n"; print $outfd "$virtdev: $value\n";
} else { } else {
print $outfd $line; print $outfd $line;
@ -6085,7 +6085,7 @@ sub update_disksize {
next if !$volid_hash->{$volid}; next if !$volid_hash->{$volid};
$drive->{size} = $volid_hash->{$volid}->{size}; $drive->{size} = $volid_hash->{$volid}->{size};
my $new = print_drive($vmid, $drive); my $new = print_drive($drive);
if ($new ne $conf->{$opt}) { if ($new ne $conf->{$opt}) {
$changes = 1; $changes = 1;
$conf->{$opt} = $new; $conf->{$opt} = $new;
@ -6683,7 +6683,7 @@ sub template_create {
my $voliddst = PVE::Storage::vdisk_create_base($storecfg, $volid); my $voliddst = PVE::Storage::vdisk_create_base($storecfg, $volid);
$drive->{file} = $voliddst; $drive->{file} = $voliddst;
$conf->{$ds} = print_drive($vmid, $drive); $conf->{$ds} = print_drive($drive);
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
}); });
} }