my $cachemode;
my $src_path;
my $src_is_iscsi = 0;
- my $src_format;
+ my $src_format = 'raw';
if ($src_storeid) {
PVE::Storage::activate_volumes($storecfg, [$src_volid], $snapname);
my $cmd = [];
push @$cmd, '/usr/bin/qemu-img', 'convert', '-p', '-n';
- push @$cmd, '-l', "snapshot.name=$snapname"
- if $snapname && $src_format && $src_format eq "qcow2";
+ push @$cmd, '-l', "snapshot.name=$snapname" if($snapname && $src_format eq "qcow2");
push @$cmd, '-t', 'none' if $dst_scfg->{type} eq 'zfspool';
push @$cmd, '-T', $cachemode if defined($cachemode);
if ($src_is_iscsi) {
push @$cmd, '--image-opts';
$src_path = convert_iscsi_path($src_path);
- } elsif ($src_format) {
+ } else {
push @$cmd, '-f', $src_format;
}
name => "efidisk",
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
expected => [
- "/usr/bin/qemu-img", "convert", "-p", "-n", "-O", "raw",
+ "/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
"/usr/share/kvm/OVMF_VARS-pure-efi.fd",
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
]
name => "efi2zos",
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0 ],
expected => [
- "/usr/bin/qemu-img", "convert", "-p", "-n", "--target-image-opts",
+ "/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "--target-image-opts",
"/usr/share/kvm/OVMF_VARS-pure-efi.fd",
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
]