Looks like the 3rd patch's first hunk should be part of this patch.
On Mon, Feb 15, 2016 at 02:33:46PM +0100, Timo Grodzinski wrote:
> Signed-off-by: Timo Grodzinski <t.grodzin...@profihost.ag>
> ---
> PVE/QemuServer.pm | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index bfce953..a130596 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -6368,7 +6368,7 @@ sub is_template {
> }
>
> sub qemu_img_convert {
> - my ($src_volid, $dst_volid, $size, $snapname) = @_;
> + my ($src_volid, $dst_volid, $size, $snapname, $dont_create_target) = @_;
>
> my $storecfg = PVE::Storage::config();
> my ($src_storeid, $src_volname) =
> PVE::Storage::parse_volume_id($src_volid, 1);
> @@ -6388,9 +6388,13 @@ sub qemu_img_convert {
> my $dst_path = PVE::Storage::path($storecfg, $dst_volid);
>
> my $cmd = [];
> - push @$cmd, '/usr/bin/qemu-img', 'convert', '-t', 'writeback', '-p',
> '-n';
> + push @$cmd, '/usr/bin/qemu-img', 'convert', '-t', 'writeback', '-p';
> + push @$cmd, '-n' if $params{dont_create_target};
With this changing a default you'd need to adapt existing calls to this
function to pass dont_create_target within the same patch (the one in
QemuServer.pm: clone_disk()) within the same patch.
> push @$cmd, '-s', $snapname if($snapname && $src_format eq "qcow2");
> - push @$cmd, '-f', $src_format, '-O', $dst_format, $src_path, $dst_path;
> + push @$cmd, '-f', $src_format if !$params{auto_src_format};
> + push @$cmd, '-O', $dst_format, $src_path, $dst_path;
> +
> + print "running '" . PVE::Tools::cmd2string( $cmd ) . "'\n" if
> $params{verbose};
>
> my $parser = sub {
> my $line = shift;
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
