From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 1/3] remove left-over mentions of to-be-dropped, outdated QMP commands
Date: Wed, 24 May 2023 15:56:49 +0200 [thread overview]
Message-ID: <20230524135654.214008-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230524135654.214008-1-f.ebner@proxmox.com>
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 <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2023-05-24 13:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 13:56 [pve-devel] [PATCH-SERIES v2 qemu-server/qemu] Some breaking QEMU changes Fiona Ebner
2023-05-24 13:56 ` Fiona Ebner [this message]
2023-05-24 13:56 ` [pve-devel] [RFC v2 qemu-server 2/3] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [RFC v2 qemu-server 3/3] cfg2cmd: drop custom id parameter Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [PATCH v2 qemu 1/3] drop patch for custom get_link_status QMP command Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [PATCH v2 qemu 2/3] drop deprecated custom drive snapshot QMP commands Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [RFC v2 qemu 3/3] drop patch for custom dummy id CLI argument Fiona Ebner
2023-06-07 17:39 ` [pve-devel] partially-applied-series: [PATCH-SERIES v2 qemu-server/qemu] Some breaking QEMU changes Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230524135654.214008-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox