[pve-devel] applied: [PATCH qemu-server 11/16] Extract volume ID before calling 'parse_volume_id'

[Fabian Grünbichler]

with slight re-grouping and blank lines added, thanks for catching this 
before it bit us!

On January 29, 2020 2:30 pm, Fabian Ebner wrote:
> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
> ---
>  PVE/QemuMigrate.pm | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index d025b09..81b52d1 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -686,8 +686,10 @@ sub phase2 {
>  	foreach my $drive (keys %{$self->{target_drive}}){
>  	    my $target = $self->{target_drive}->{$drive};
>  	    my $nbd_uri = $target->{nbd_uri};
> -	    my $source_sid = PVE::Storage::Plugin::parse_volume_id($conf->{$drive});
> -	    my $target_sid = PVE::Storage::Plugin::parse_volume_id($target->{drivestr});
> +	    my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr});
> +	    my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive});
> +	    my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_drive->{file});
> +	    my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_drive->{file});
>  	    my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$source_sid, $target_sid], $opt_bwlimit);
>  
>  	    $self->log('info', "$drive: start migration to $nbd_uri");
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
>