again, limited to the non-alignmnet changes
On August 1, 2023 4:46 pm, Philipp Hufnagl wrote:
> Signed-off-by: Philipp Hufnagl <p.hufn...@proxmox.com>
> ---
> src/PVE/Storage/Plugin.pm | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
> index 18cb5d5..1795ae3 100644
> --- a/src/PVE/Storage/Plugin.pm
> +++ b/src/PVE/Storage/Plugin.pm
> @@ -264,7 +264,7 @@ sub verify_server {
> my ($server, $noerr) = @_;
>
> if (!(PVE::JSONSchema::pve_verify_ip($server, 1) ||
> - PVE::JSONSchema::pve_verify_dns_name($server, 1)))
> + PVE::JSONSchema::pve_verify_dns_name($server, 1)))
> {
> return undef if $noerr;
> die "value does not look like a valid server name or IP address\n";
> @@ -472,7 +472,7 @@ sub encode_value {
> my ($class, $type, $key, $value) = @_;
>
> if ($key eq 'nodes') {
> - return join(',', keys(%$value));
> + return join(',', keys(%$value));
> } elsif ($key eq 'content') {
> my $res = content_hash_to_string($value) || 'none';
> return $res;
> @@ -1153,9 +1153,9 @@ sub volume_has_feature {
>
> my $key = undef;
> if($snapname){
> - $key = 'snap';
> + $key = 'snap';
> }else{
> - $key = $isBase ? 'base' : 'current';
> + $key = $isBase ? 'base' : 'current';
> }
>
> return 1 if defined($features->{$feature}->{$key}->{$format});
> @@ -1199,14 +1199,14 @@ sub list_images {
> next if !$found;
> }
>
> - my $info = {
> + my $info = {
> volid => $volid, format => $format,
> size => $size, vmid => $owner, used => $used, parent => $parent
> };
>
> - $info->{ctime} = $ctime if $ctime;
> + $info->{ctime} = $ctime if $ctime;
>
> - push @$res, $info;
> + push @$res, $info;
> }
>
> return $res;
> @@ -1580,7 +1580,7 @@ sub volume_export {
> run_command(['dd', "if=$file", "bs=4k"], output =>
> '>&'.fileno($fh));
> } else {
> run_command(['qemu-img', 'convert', '-f', $file_format, '-O',
> 'raw', $file, '/dev/stdout'],
> - output => '>&'.fileno($fh));
> + output => '>&'.fileno($fh));
> }
> return;
> } elsif ($format =~ /^(qcow2|vmdk)\+size$/) {
> @@ -1593,7 +1593,7 @@ sub volume_export {
> goto unsupported if $file_format ne 'subvol';
> write_common_header($fh, $size);
> run_command(['tar', @COMMON_TAR_FLAGS, '-cf', '-', '-C', $file,
> '.'],
> - output => '>&'.fileno($fh));
> + output => '>&'.fileno($fh));
> return;
> }
> }
> @@ -1662,10 +1662,10 @@ sub volume_import {
> or die "internal error: failed to get path to newly allocated
> volume $volname\n";
> if ($data_format eq 'raw' || $data_format eq 'qcow2' || $data_format eq
> 'vmdk') {
> run_command(['dd', "of=$file", 'conv=sparse', 'bs=64k'],
> - input => '<&'.fileno($fh));
> + input => '<&'.fileno($fh));
> } elsif ($data_format eq 'tar') {
> run_command(['tar', @COMMON_TAR_FLAGS, '-C', $file, '-xf', '-'],
> - input => '<&'.fileno($fh));
> + input => '<&'.fileno($fh));
> } else {
> die "volume import format '$format' not available for $class";
> }
> --
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
