From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 4F8656B1D4
for <pve-devel@lists.proxmox.com>; Tue, 3 Aug 2021 09:38:01 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 440AEF4F1
for <pve-devel@lists.proxmox.com>; Tue, 3 Aug 2021 09:38:01 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id AFDD3F4E3
for <pve-devel@lists.proxmox.com>; Tue, 3 Aug 2021 09:38:00 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7C52B4100E
for <pve-devel@lists.proxmox.com>; Tue, 3 Aug 2021 09:38:00 +0200 (CEST)
To: pve-devel@lists.proxmox.com, Aaron Lauterer <a.lauterer@proxmox.com>
References: <20210719145254.2269142-1-a.lauterer@proxmox.com>
<20210719145254.2269142-7-a.lauterer@proxmox.com>
From: Fabian Ebner <f.ebner@proxmox.com>
Message-ID: <d2fca2ee-efce-996f-e1e0-010a031b6bbe@proxmox.com>
Date: Tue, 3 Aug 2021 09:37:59 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.12.0
MIME-Version: 1.0
In-Reply-To: <20210719145254.2269142-7-a.lauterer@proxmox.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.444 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.001 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [qemu.pm]
Subject: Re: [pve-devel] [PATCH v1 qemu-server 6/9] api: move-disk: cleanup
very long lines
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 03 Aug 2021 07:38:01 -0000
Am 19.07.21 um 16:52 schrieb Aaron Lauterer:
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 25 ++++++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index ed1179b..0529c1b 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -3301,13 +3301,15 @@ __PACKAGE__->register_method({
> },
> delete => {
> type => 'boolean',
> - description => "Delete the original disk after successful copy. By default the original disk is kept as unused disk.",
> + description => "Delete the original disk after successful copy. By default the " .
> + "original disk is kept as unused disk.",
> optional => 1,
> default => 0,
> },
> digest => {
> type => 'string',
> - description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
> + description => 'Prevent changes if current configuration file has different SHA1 " .
> + "digest. This can be used to prevent concurrent modifications.',
> maxLength => 40,
> optional => 1,
> },
> @@ -3386,11 +3388,20 @@ __PACKAGE__->register_method({
> (!$format || !$oldfmt || $oldfmt eq $format);
>
> # this only checks snapshots because $disk is passed!
> - my $snapshotted = PVE::QemuServer::Drive::is_volume_in_use($storecfg, $conf, $disk, $old_volid);
> + my $snapshotted = PVE::QemuServer::Drive::is_volume_in_use(
> + $storecfg,
> + $conf,
> + $disk,
> + $old_volid
style nit: missing trailing comma (also below and for the last container
patch)
> + );
> die "you can't move a disk with snapshots and delete the source\n"
> if $snapshotted && $param->{delete};
>
> - PVE::Cluster::log_msg('info', $authuser, "move disk VM $vmid: move --disk $disk --storage $storeid");
> + PVE::Cluster::log_msg(
> + 'info',
> + $authuser,
> + "move disk VM $vmid: move --disk $disk --storage $storeid"
> + );
>
> my $running = PVE::QemuServer::check_running($vmid);
>
> @@ -3409,7 +3420,11 @@ __PACKAGE__->register_method({
> if $snapshotted;
>
> my $bwlimit = extract_param($param, 'bwlimit');
> - my $movelimit = PVE::Storage::get_bandwidth_limit('move', [$oldstoreid, $storeid], $bwlimit);
> + my $movelimit = PVE::Storage::get_bandwidth_limit(
> + 'move',
> + [$oldstoreid, $storeid],
> + $bwlimit
> + );
>
> my $newdrive = PVE::QemuServer::clone_disk(
> $storecfg,
>