tests: Fix qemu replies wrt usb-host properties

My commit of v6.9.0-rc1~457 was a bit too harsh. While it served
its purpose (adding usb-host.hostdevice capability) it has a side
effect: because I copied reply from qemu-5.1.0 to older .replies
files one might now think that say qemu-3.1.0 supports both
.guest-reset and .guest-resets-all properties. But in fact it
doesn't. There are three problematic properties:

1) guest-reset, introduced in v4.0.0-rc0~56^2
2) guest-resets-all introduced in v4.2.0-rc1~9^2
3) suppress-remote-wake introduced in v5.0.0-rc0~148^2~4

Remove these properties from versions that could not have had
them.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 5663253798d4f43ee3de521592688ce2a9db7b9e..95dd682e95f3a3bfed961d69894d65a1ecc0f8e9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -17325,11 +17325,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17340,16 +17335,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
-    {
-      "default-value": true,
-      "name": "guest-reset",
-      "type": "bool"
-    },
     {
       "name": "bootindex",
       "type": "int32"

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index 144448783abea2e84d5228e340b4362c3847ff3a..6bb6a399f6feed818de3b2da8977d286d27010e2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -17167,11 +17167,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17182,16 +17177,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
-    {
-      "default-value": true,
-      "name": "guest-reset",
-      "type": "bool"
-    },
     {
       "name": "bootindex",
       "type": "int32"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index aa45d033b6780c07909114c2a9304c1080ae8787..3107b86a0d328131b75d10e849bc26e9a20b3ac8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -17969,11 +17969,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17984,11 +17979,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
index acba6b8363f4b3366b099192cc2d5bd5b89fb478..e5c08f757f73b765dae439533b1da9d5e1820f3e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
@@ -17995,11 +17995,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -18010,11 +18005,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 2f2db7a1056164fba60270a79e00b0119b79d43f..98b2a87645bfa4fbdbd780f1d64c6dda503a6566 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -16335,11 +16335,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16350,11 +16345,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index fca6bd93c0fe5d701f7315a708e47bd7337a269c..f938d5b2e3e0e60dc8e4f4528c7d2cba21cc7099 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -16335,11 +16335,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16350,11 +16345,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 2e69a447b3f121925e4ef29a9c4571fd3842a033..79093095229b42913ab072590c1d8620c48d724f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -16279,11 +16279,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16294,11 +16289,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 5de9457eed38b7c0b7eda38d23f2afce4bfb9ad2..e355c6ef1cbb03546f00b2e0ad437f45d6c5507c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -17672,11 +17672,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17687,11 +17682,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index 0dadabf9481f09d310809ebe527524b43fbac04b..480f22fd990cb914d7d8b6066d3d5b9076f090f9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -18085,11 +18085,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -18100,11 +18095,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 5321348322318668e0a2b3c766bab640972160b5..06e00fe169a32c0d38eb315700a54b61bc807dd0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -18825,11 +18825,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index 4ed901c3de27ed9e916bf81f0e91b0033a226801..a0d3f217c82f0938514d74709558c5a8db04d283 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -18288,11 +18288,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index 334a10b3c57542fdf383a57e66fc840de6005ab9..e0994fec0ffdede9c1cad8fad9a4ff8bf737ed48 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -16995,11 +16995,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index cd7a5c345c7762d509ee2b8e29c622932c2f85d8..a201fc2882121c95607feec8e7c9a4320536d319 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -18659,11 +18659,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",