From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C92629B026 for ; Wed, 24 May 2023 15:56:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA2941F1B3 for ; Wed, 24 May 2023 15:56:57 +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 for ; Wed, 24 May 2023 15:56:57 +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 E5AB446E12 for ; Wed, 24 May 2023 15:56:56 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 24 May 2023 15:56:49 +0200 Message-Id: <20230524135654.214008-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230524135654.214008-1-f.ebner@proxmox.com> References: <20230524135654.214008-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server 1/3] remove left-over mentions of to-be-dropped, outdated QMP commands X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2023 13:56:57 -0000 The commands snapshot-drive and delete-drive-snapshot have been unused by qemu-server since commit eba2b721 ("use qemu's blockdev-snapshot functions") and are now going to be dropped in our QEMU builds too, so get rid of these left-overs. Signed-off-by: Fiona Ebner --- New in v2. PVE/QMPClient.pm | 4 +--- test/snapshot-test.pm | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm index 3bc5eaa1..ef5c19b3 100644 --- a/PVE/QMPClient.pm +++ b/PVE/QMPClient.pm @@ -126,12 +126,10 @@ sub cmd { $cmd->{execute} eq 'block-job-complete' || $cmd->{execute} eq 'backup-cancel' || $cmd->{execute} eq 'query-savevm' || - $cmd->{execute} eq 'delete-drive-snapshot' || $cmd->{execute} eq 'guest-fstrim' || $cmd->{execute} eq 'guest-shutdown' || $cmd->{execute} eq 'blockdev-snapshot-internal-sync' || - $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' || - $cmd->{execute} eq 'snapshot-drive' + $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ) { $timeout = 10*60; # 10 mins ? } else { diff --git a/test/snapshot-test.pm b/test/snapshot-test.pm index d26b4223..dd69fa31 100644 --- a/test/snapshot-test.pm +++ b/test/snapshot-test.pm @@ -328,9 +328,6 @@ sub qmp_cmd { my ($vmid, $cmd) = @_; my $exec = $cmd->{execute}; - if ($exec eq "delete-drive-snapshot") { - return; - } if ($exec eq "guest-ping") { die "guest-ping disabled\n" if !$vm_mon->{guest_ping}; -- 2.39.2