Since we know the full list of machine types supported
by the QEMU binary when probing machine type properties,
we can save some work (and eventually test suite churn,
as more architecture-specific machine types need to be
probed) by only probing machines that we know exist.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 5 ++
.../caps_2.12.0.aarch64.replies | 44 +++++---------
.../caps_2.12.0.s390x.replies | 48 +++++----------
.../caps_2.12.0.x86_64.replies | 60 +++++++------------
.../caps_3.0.0.riscv32.replies | 36 ++++-------
.../caps_3.0.0.riscv64.replies | 36 ++++-------
.../caps_3.0.0.s390x.replies | 48 +++++----------
.../caps_3.0.0.x86_64.replies | 60 +++++++------------
.../caps_3.1.0.x86_64.replies | 60 +++++++------------
.../caps_4.0.0.aarch64.replies | 44 +++++---------
.../caps_4.0.0.riscv32.replies | 36 ++++-------
.../caps_4.0.0.riscv64.replies | 36 ++++-------
.../caps_4.0.0.s390x.replies | 48 +++++----------
.../caps_4.0.0.x86_64.replies | 60 +++++++------------
14 files changed, 209 insertions(+), 412 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e12f076da8..d13c2c1192 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2361,6 +2361,11 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps,
const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, props.type);
VIR_AUTOFREE(char *) type = NULL;
+ /* If the machine type is not supported by the QEMU binary, we
+ * don't need to bother probing its properties */
+ if (!virQEMUCapsIsMachineSupported(qemuCaps, canon))
+ continue;
+
/* The QOM type for machine types is the machine type name
* followed by the -machine suffix */
if (virAsprintf(&type, "%s-machine", canon) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 7b42e70d5d..67553451fc 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -5632,25 +5632,9 @@
"id": "libvirt-31"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-32"
-}
-
-{
- "id": "libvirt-32",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -5826,35 +5810,35 @@
"static": false
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
"emulator"
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -7015,12 +6999,12 @@
"option": "drive"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -7082,12 +7066,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -18455,12 +18439,12 @@
"meta-type": "object"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -18476,7 +18460,7 @@
"kernel": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 3cd62cd10a..77afcbaa5b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -3808,25 +3808,9 @@
"id": "libvirt-31"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-32"
-}
-
-{
- "id": "libvirt-32",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -4361,35 +4345,35 @@
"migration-safe": true
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
"emulator"
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -5514,12 +5498,12 @@
"option": "drive"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -5581,12 +5565,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -16954,7 +16938,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -16965,7 +16949,7 @@
"name": "host"
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17003,7 +16987,7 @@
}
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17017,11 +17001,11 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
- "id": "libvirt-40",
+ "id": "libvirt-39",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 124be0cd71..2e4e5ae4ab 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -4965,25 +4965,9 @@
"id": "libvirt-37"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-38"
-}
-
-{
- "id": "libvirt-38",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -5497,12 +5481,12 @@
"migration-safe": true
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -5510,12 +5494,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -5523,12 +5507,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -6815,12 +6799,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -6882,12 +6866,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -18255,7 +18239,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -18266,7 +18250,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -18456,7 +18440,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -18648,7 +18632,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -18903,7 +18887,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -18917,7 +18901,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -19107,7 +19091,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -19299,7 +19283,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -19554,12 +19538,12 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -19569,7 +19553,7 @@
"cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index ce6f554cfe..389fc95e0e 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1697,36 +1697,20 @@
"id": "libvirt-27"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-28"
-}
-
-{
- "id": "libvirt-28",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-tpm-models",
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
"return": [
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -1734,12 +1718,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -2864,12 +2848,12 @@
"option": "drive"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -2939,12 +2923,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -14619,5 +14603,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 8884ca1c6e..65da947c60 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1697,36 +1697,20 @@
"id": "libvirt-27"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-28"
-}
-
-{
- "id": "libvirt-28",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-tpm-models",
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
"return": [
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -1734,12 +1718,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -2864,12 +2848,12 @@
"option": "drive"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -2939,12 +2923,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -14619,5 +14603,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
index b385e27fa1..5640750d19 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@@ -3967,25 +3967,9 @@
"id": "libvirt-32"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-33"
-}
-
-{
- "id": "libvirt-33",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -4536,35 +4520,35 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
"emulator"
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -5724,12 +5708,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -5799,12 +5783,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17479,7 +17463,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17490,7 +17474,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -17532,7 +17516,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -17546,11 +17530,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 964759a50d..d5f40bd1d4 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -5106,25 +5106,9 @@
"id": "libvirt-37"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-38"
-}
-
-{
- "id": "libvirt-38",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -5561,12 +5545,12 @@
"migration-safe": true
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -5574,12 +5558,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -5587,12 +5571,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -6891,12 +6875,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -6966,12 +6950,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -18851,7 +18835,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -18862,7 +18846,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -19055,7 +19039,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -19250,7 +19234,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -19513,7 +19497,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -19527,7 +19511,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -19720,7 +19704,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -19915,7 +19899,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -20178,16 +20162,16 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index b562839794..7567ee6f42 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -5179,25 +5179,9 @@
"id": "libvirt-37"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-38"
-}
-
-{
- "id": "libvirt-38",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -5716,12 +5700,12 @@
"migration-safe": true
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -5729,12 +5713,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -5742,12 +5726,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -7021,12 +7005,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -7096,12 +7080,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -19286,7 +19270,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -19297,7 +19281,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -19499,7 +19483,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -19703,7 +19687,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -19978,7 +19962,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -19992,7 +19976,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -20194,7 +20178,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -20398,7 +20382,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -20673,16 +20657,16 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index 043189d1ac..128ee04e86 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -6210,25 +6210,9 @@
"id": "libvirt-32"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-33"
-}
-
-{
- "id": "libvirt-33",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -6419,34 +6403,34 @@
"static": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -7594,12 +7578,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -7673,12 +7657,12 @@
"capability": "x-ignore-shared"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -19765,12 +19749,12 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -19786,7 +19770,7 @@
"kernel": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 5205bda05c..053b714825 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -4079,47 +4079,31 @@
"id": "libvirt-33"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-34"
-}
-
-{
- "id": "libvirt-34",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -5391,12 +5375,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -5470,12 +5454,12 @@
"capability": "x-ignore-shared"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17754,5 +17738,5 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index dfe5671a58..2db59687aa 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -4079,47 +4079,31 @@
"id": "libvirt-33"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-34"
-}
-
-{
- "id": "libvirt-34",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -5391,12 +5375,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -5470,12 +5454,12 @@
"capability": "x-ignore-shared"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -17754,5 +17738,5 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 6f74f107f7..8c2c299828 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -4280,25 +4280,9 @@
"id": "libvirt-32"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-33"
-}
-
-{
- "id": "libvirt-33",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -4873,34 +4857,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -6043,12 +6027,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -6122,12 +6106,12 @@
"capability": "x-ignore-shared"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -18295,7 +18279,7 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -18306,7 +18290,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -18351,7 +18335,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -18365,11 +18349,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 6cfff8b7e0..52a2825505 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -5412,25 +5412,9 @@
"id": "libvirt-37"
}
-{
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "pseries-machine"
- },
- "id": "libvirt-38"
-}
-
-{
- "id": "libvirt-38",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Class 'pseries-machine' not found"
- }
-}
-
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -5947,12 +5931,12 @@
"migration-safe": true
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -5960,12 +5944,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -5973,12 +5957,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -7260,12 +7244,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -7339,12 +7323,12 @@
"capability": "x-ignore-shared"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -19809,7 +19793,7 @@
]
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -19820,7 +19804,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -20024,7 +20008,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -20230,7 +20214,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -20509,7 +20493,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -20523,7 +20507,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -20727,7 +20711,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -20933,7 +20917,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -21212,16 +21196,16 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
--
2.21.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
