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@xxxxxxxxxx>
---
.../qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 15 ---------------
.../caps_3.1.0.x86_64.replies | 15 ---------------
.../caps_4.0.0.aarch64.replies | 10 ----------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 10 ----------
.../caps_4.0.0.riscv32.replies | 10 ----------
.../caps_4.0.0.riscv64.replies | 10 ----------
.../qemucapabilitiesdata/caps_4.0.0.s390x.replies | 10 ----------
.../caps_4.0.0.x86_64.replies | 10 ----------
.../caps_4.1.0.x86_64.replies | 10 ----------
.../caps_4.2.0.aarch64.replies | 5 -----
.../qemucapabilitiesdata/caps_4.2.0.ppc64.replies | 5 -----
.../qemucapabilitiesdata/caps_4.2.0.s390x.replies | 5 -----
.../caps_4.2.0.x86_64.replies | 5 -----
13 files changed, 120 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 5663253798..95dd682e95 100644
--- 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 144448783a..6bb6a399f6 100644
--- 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 aa45d033b6..3107b86a0d 100644
--- 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 acba6b8363..e5c08f757f 100644
--- 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 2f2db7a105..98b2a87645 100644
--- 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 fca6bd93c0..f938d5b2e3 100644
--- 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 2e69a447b3..7909309522 100644
--- 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 5de9457eed..e355c6ef1c 100644
--- 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 0dadabf948..480f22fd99 100644
--- 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 5321348322..06e00fe169 100644
--- 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 4ed901c3de..a0d3f217c8 100644
--- 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 334a10b3c5..e0994fec0f 100644
--- 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 cd7a5c345c..a201fc2882 100644
--- 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",
--
2.35.1
