remove $vmid param from print_drive

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>

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 51fe1420a85c240aa6a0331f39f009d56bd4de25..fbf036ae7d4d19061c6717489ae86342262c0426 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -147,7 +147,7 @@ my $create_disks = sub {
 
        if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
            delete $disk->{size};
 
        if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
            delete $disk->{size};

-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);

        } elsif (defined($volname) && $volname eq 'cloudinit') {
            $storeid = $storeid // $default_storage;
            die "no storage ID specified (and no default storage)\n" if !$storeid;
        } elsif (defined($volname) && $volname eq 'cloudinit') {
            $storeid = $storeid // $default_storage;
            die "no storage ID specified (and no default storage)\n" if !$storeid;


@@ -169,7 +169,7 @@ my $create_disks = sub {
            $disk->{media} = 'cdrom';
            push @$vollist, $volid;
            delete $disk->{format}; # no longer needed
            $disk->{media} = 'cdrom';
            push @$vollist, $volid;
            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) {
            my ($storeid, $size) = ($2 || $default_storage, $3);
            die "no storage ID specified (and no default storage)\n" if !$storeid;
        } elsif ($volid =~ $NEW_DISK_RE) {
            my ($storeid, $size) = ($2 || $default_storage, $3);
            die "no storage ID specified (and no default storage)\n" if !$storeid;


@@ -188,7 +188,7 @@ my $create_disks = sub {
            $disk->{file} = $volid;
            $disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b');
            delete $disk->{format}; # no longer needed
            $disk->{file} = $volid;
            $disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b');
            delete $disk->{format}; # no longer needed

-           $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+           $res->{$ds} = PVE::QemuServer::print_drive($disk);

        } else {
 
            PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
        } else {
 
            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;
 
                    PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
                    raise_param_exc({ $opt => "unable to parse drive options" }) if !$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;
            PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
            $check_replication->($drive);
            raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
            PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
            $check_replication->($drive);

-           $param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
+           $param->{$opt} = PVE::QemuServer::print_drive($drive);

        } elsif ($opt =~ m/^net(\d+)$/) {
            # add macaddr
            my $net = PVE::QemuServer::parse_net($param->{$opt});
        } elsif ($opt =~ m/^net(\d+)$/) {
            # add macaddr
            my $net = PVE::QemuServer::parse_net($param->{$opt});


@@ -2905,7 +2905,7 @@ __PACKAGE__->register_method({
                                                                   $newid, $storage, $format, $fullclone->{$opt}, $newvollist,
                                                                   $jobs, $skipcomplete, $oldconf->{agent}, $clonelimit);
 
                                                                   $newid, $storage, $format, $fullclone->{$opt}, $newvollist,
                                                                   $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);
                        $i++;
 
                        PVE::QemuConfig->write_config($newid, $newconf);
                        $i++;


@@ -3099,7 +3099,7 @@ __PACKAGE__->register_method({
                    my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef,
                                                               $vmid, $storeid, $format, 1, $newvollist, undef, undef, undef, $movelimit);
 
                    my $newdrive = PVE::QemuServer::clone_disk($storecfg, $vmid, $running, $disk, $drive, undef,
                                                               $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);
 
            $drive->{size} = $newsize;
            PVE::QemuServer::qemu_block_resize($vmid, "drive-$disk", $storecfg, $volid, $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);
        };

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index b5df035edaa060ac8117f5b20730eb98f5f92c1c..27c5b7af7b42bd0979aec9dc5797d7b508c1070d 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -950,7 +950,7 @@ sub phase3_cleanup {
        } else {
            foreach my $target_drive (keys %{$self->{target_drive}}) {
                my $drive = PVE::QemuServer::parse_drive($target_drive, $self->{target_drive}->{$target_drive}->{volid});
        } else {
            foreach my $target_drive (keys %{$self->{target_drive}}) {
                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);
            }
        }

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 5e086df3691a9e9116e8825216f765186b6ea948..e10461f11ae1f5cb39fc04ed4922deec7858a811 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1751,7 +1751,7 @@ sub parse_drive {
 }
 
 sub print_drive {
 }
 
 sub print_drive {

-    my ($vmid, $drive) = @_;
+    my ($drive) = @_;

     my $data = { %$drive };
     delete $data->{$_} for qw(index interface);
     return PVE::JSONSchema::print_property_string($data, $alldrive_fmt);
     my $data = { %$drive };
     delete $data->{$_} for qw(index interface);
     return PVE::JSONSchema::print_property_string($data, $alldrive_fmt);


@@ -2663,7 +2663,7 @@ sub parse_vm_config {
                    my $v = parse_drive($key, $value);
                    if (my $volid = filename_to_volume_id($vmid, $v->{file}, $v->{media})) {
                        $v->{file} = $volid;
                    my $v = parse_drive($key, $value);
                    if (my $volid = filename_to_volume_id($vmid, $v->{file}, $v->{media})) {
                        $v->{file} = $volid;

-                       $value = print_drive($vmid, $v);
+                       $value = print_drive($v);

                    } else {
                        warn "vm $vmid - unable to parse value of '$key'\n";
                        next;
                    } else {
                        warn "vm $vmid - unable to parse value of '$key'\n";
                        next;


@@ -5263,7 +5263,7 @@ sub vm_start {
                my $newdrive = $drive;
                $newdrive->{format} = $format;
                $newdrive->{file} = $newvolid;
                my $newdrive = $drive;
                $newdrive->{format} = $format;
                $newdrive->{file} = $newvolid;

-               my $drivestr = PVE::QemuServer::print_drive($vmid, $newdrive);
+               my $drivestr = print_drive($newdrive);

                $local_volumes->{$opt} = $drivestr;
                #pass drive to conf for command line
                $conf->{$opt} = $drivestr;
                $local_volumes->{$opt} = $drivestr;
                #pass drive to conf for command line
                $conf->{$opt} = $drivestr;


@@ -5971,7 +5971,7 @@ sub restore_update_config_line {
        } elsif ($map->{$virtdev}) {
            delete $di->{format}; # format can change on restore
            $di->{file} = $map->{$virtdev};
        } elsif ($map->{$virtdev}) {
            delete $di->{format}; # format can change on restore
            $di->{file} = $map->{$virtdev};

-           $value = print_drive($vmid, $di);
+           $value = print_drive($di);

            print $outfd "$virtdev: $value\n";
        } else {
            print $outfd $line;
            print $outfd "$virtdev: $value\n";
        } else {
            print $outfd $line;


@@ -6085,7 +6085,7 @@ sub update_disksize {
            next if !$volid_hash->{$volid};
 
            $drive->{size} = $volid_hash->{$volid}->{size};
            next if !$volid_hash->{$volid};
 
            $drive->{size} = $volid_hash->{$volid}->{size};

-           my $new = print_drive($vmid, $drive);
+           my $new = print_drive($drive);

            if ($new ne $conf->{$opt}) {
                $changes = 1;
                $conf->{$opt} = $new;
            if ($new ne $conf->{$opt}) {
                $changes = 1;
                $conf->{$opt} = $new;


@@ -6683,7 +6683,7 @@ sub template_create {
 
        my $voliddst = PVE::Storage::vdisk_create_base($storecfg, $volid);
        $drive->{file} = $voliddst;
 
        my $voliddst = PVE::Storage::vdisk_create_base($storecfg, $volid);
        $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);
     });
 }