From c0ed248b78e378e6adcd0af8e5d39847d0330aa8 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 8 Nov 2023 14:50:10 +0100
Subject: [PATCH] tests: qemumigparamsdata: Drop deprecated fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Migration compression parameters 'compress-level', 'compress-threads',
'decompress-threads' were deprecated by qemu. Drop them from the tests.

Note that the migration code automatically checks whether given
capability is supported by qemu and thus we don't need to add any
further code to prepare for the legacy compression to be dropped.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/qemumigparamsdata/basic.json         | 3 ---
 tests/qemumigparamsdata/basic.reply        | 3 ---
 tests/qemumigparamsdata/basic.xml          | 3 ---
 tests/qemumigparamsdata/tls-enabled.json   | 3 ---
 tests/qemumigparamsdata/tls-enabled.reply  | 3 ---
 tests/qemumigparamsdata/tls-enabled.xml    | 3 ---
 tests/qemumigparamsdata/tls-hostname.json  | 3 ---
 tests/qemumigparamsdata/tls-hostname.reply | 3 ---
 tests/qemumigparamsdata/tls-hostname.xml   | 3 ---
 tests/qemumigparamsdata/tls.json           | 3 ---
 tests/qemumigparamsdata/tls.reply          | 3 ---
 tests/qemumigparamsdata/tls.xml            | 3 ---
 12 files changed, 36 deletions(-)

diff --git a/tests/qemumigparamsdata/basic.json b/tests/qemumigparamsdata/basic.json
index b810d7cc87..9dae86fcbc 100644
--- a/tests/qemumigparamsdata/basic.json
+++ b/tests/qemumigparamsdata/basic.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "max-bandwidth": 33554432,
diff --git a/tests/qemumigparamsdata/basic.reply b/tests/qemumigparamsdata/basic.reply
index dd8c5287a5..e9c3c4714e 100644
--- a/tests/qemumigparamsdata/basic.reply
+++ b/tests/qemumigparamsdata/basic.reply
@@ -1,10 +1,7 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "max-bandwidth": 33554432,
     "downtime-limit": 300
diff --git a/tests/qemumigparamsdata/basic.xml b/tests/qemumigparamsdata/basic.xml
index 2ca532eff5..e8af42dff5 100644
--- a/tests/qemumigparamsdata/basic.xml
+++ b/tests/qemumigparamsdata/basic.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='max-bandwidth' value='33554432'/>
diff --git a/tests/qemumigparamsdata/tls-enabled.json b/tests/qemumigparamsdata/tls-enabled.json
index d42684a9de..098d3ae148 100644
--- a/tests/qemumigparamsdata/tls-enabled.json
+++ b/tests/qemumigparamsdata/tls-enabled.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "objlibvirt_migrate_tls0",
diff --git a/tests/qemumigparamsdata/tls-enabled.reply b/tests/qemumigparamsdata/tls-enabled.reply
index 001241b075..e3ce8e7778 100644
--- a/tests/qemumigparamsdata/tls-enabled.reply
+++ b/tests/qemumigparamsdata/tls-enabled.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "objlibvirt_migrate_tls0",
     "max-bandwidth": 33554432,
diff --git a/tests/qemumigparamsdata/tls-enabled.xml b/tests/qemumigparamsdata/tls-enabled.xml
index 3e60c4dec3..554b6855d4 100644
--- a/tests/qemumigparamsdata/tls-enabled.xml
+++ b/tests/qemumigparamsdata/tls-enabled.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value='objlibvirt_migrate_tls0'/>
diff --git a/tests/qemumigparamsdata/tls-hostname.json b/tests/qemumigparamsdata/tls-hostname.json
index abbd9f124b..2943df769b 100644
--- a/tests/qemumigparamsdata/tls-hostname.json
+++ b/tests/qemumigparamsdata/tls-hostname.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "objlibvirt_migrate_tls0",
diff --git a/tests/qemumigparamsdata/tls-hostname.reply b/tests/qemumigparamsdata/tls-hostname.reply
index 74f069f780..f7e7a96bc5 100644
--- a/tests/qemumigparamsdata/tls-hostname.reply
+++ b/tests/qemumigparamsdata/tls-hostname.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "f27-1.virt",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "objlibvirt_migrate_tls0",
     "max-bandwidth": 33554432,
diff --git a/tests/qemumigparamsdata/tls-hostname.xml b/tests/qemumigparamsdata/tls-hostname.xml
index 4310e789a0..addb5e68a4 100644
--- a/tests/qemumigparamsdata/tls-hostname.xml
+++ b/tests/qemumigparamsdata/tls-hostname.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value='objlibvirt_migrate_tls0'/>
diff --git a/tests/qemumigparamsdata/tls.json b/tests/qemumigparamsdata/tls.json
index 02e90c60ea..2bfd4a2635 100644
--- a/tests/qemumigparamsdata/tls.json
+++ b/tests/qemumigparamsdata/tls.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "",
diff --git a/tests/qemumigparamsdata/tls.reply b/tests/qemumigparamsdata/tls.reply
index 591eca6926..cd5bb26cca 100644
--- a/tests/qemumigparamsdata/tls.reply
+++ b/tests/qemumigparamsdata/tls.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "",
     "max-bandwidth": 33554432,
diff --git a/tests/qemumigparamsdata/tls.xml b/tests/qemumigparamsdata/tls.xml
index 71e5bbb7cb..37ea8e90ec 100644
--- a/tests/qemumigparamsdata/tls.xml
+++ b/tests/qemumigparamsdata/tls.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value=''/>