From: Peter Krempa <pkrempa@redhat.com> In previous patches we've successfuly replaced it by looking at the qom types we already query so we don't need to invoke extra commands. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 25 --------- .../caps_10.0.0_aarch64.replies | 42 +++------------ .../caps_10.0.0_ppc64.replies | 29 +--------- .../caps_10.0.0_s390x.replies | 32 +++-------- .../caps_10.0.0_x86_64+amdsev.replies | 50 +++++------------ .../caps_10.0.0_x86_64.replies | 50 +++++------------ .../caps_10.1.0_x86_64+inteltdx.replies | 54 +++++-------------- .../caps_10.1.0_x86_64.replies | 54 +++++-------------- .../caps_6.2.0_ppc64.replies | 29 +--------- .../caps_6.2.0_x86_64.replies | 50 +++++------------ .../caps_7.0.0_ppc64.replies | 29 +--------- .../caps_7.0.0_x86_64.replies | 50 +++++------------ .../caps_7.1.0_ppc64.replies | 29 +--------- .../caps_7.1.0_x86_64.replies | 50 +++++------------ .../caps_7.2.0_ppc.replies | 24 +-------- .../caps_7.2.0_x86_64+hvf.replies | 50 +++++------------ .../caps_7.2.0_x86_64.replies | 50 +++++------------ .../caps_8.0.0_x86_64.replies | 50 +++++------------ .../caps_8.1.0_s390x.replies | 28 ++-------- .../caps_8.1.0_x86_64.replies | 50 +++++------------ .../caps_8.2.0_aarch64.replies | 42 +++------------ .../caps_8.2.0_armv7l.replies | 42 +++------------ .../caps_8.2.0_loongarch64.replies | 28 ++-------- .../caps_8.2.0_s390x.replies | 28 ++-------- .../caps_8.2.0_x86_64.replies | 50 +++++------------ .../caps_9.0.0_sparc.replies | 24 +-------- .../caps_9.0.0_x86_64.replies | 50 +++++------------ .../caps_9.1.0_riscv64.replies | 33 ++---------- .../caps_9.1.0_s390x.replies | 32 +++-------- .../caps_9.1.0_x86_64.replies | 50 +++++------------ .../caps_9.2.0_aarch64+hvf.replies | 41 +++----------- .../caps_9.2.0_s390x.replies | 32 +++-------- .../caps_9.2.0_x86_64+amdsev.replies | 50 +++++------------ .../caps_9.2.0_x86_64.replies | 50 +++++------------ 34 files changed, 274 insertions(+), 1103 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7404ad27f..688d100b01 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3388,29 +3388,6 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *qemuCaps, } -static int -virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps G_GNUC_UNUSED, - qemuMonitor *mon) -{ - g_auto(GStrv) models = NULL; - g_auto(GStrv) types = NULL; - - if (qemuMonitorGetTPMModels(mon, &models) < 0) - return -1; - - if (!models) - return 0; - - if (qemuMonitorGetTPMTypes(mon, &types) < 0) - return -1; - - if (!types) - return 0; - - return 0; -} - - static int virQEMUCapsProbeQMPKVMState(virQEMUCaps *qemuCaps, qemuMonitor *mon) @@ -5724,8 +5701,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, return -1; if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, accel, mon) < 0) return -1; - if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0) - return -1; if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies index 7bee1a2933..f3d7ee69c1 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies @@ -34286,35 +34286,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -35781,12 +35755,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { "execute": "query-gic-capabilities", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -35802,7 +35776,7 @@ "kernel": false } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -35813,7 +35787,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -35846,7 +35820,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -35861,11 +35835,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-41" } { - "id": "libvirt-43", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Parameter 'model.props.hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies index e57c577b8b..76d0b6fb6f 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies @@ -35136,34 +35136,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -36525,7 +36500,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies index 1188b5945a..52068141f9 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies @@ -31837,29 +31837,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -33137,7 +33117,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -33148,7 +33128,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -33220,7 +33200,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -33231,7 +33211,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -33387,7 +33367,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies index cc32a73026..d49f1c3548 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies @@ -37353,35 +37353,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38904,12 +38878,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38920,16 +38894,16 @@ "pdh": "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", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD+qQRCYS9joBYSHMD1g+rmjY+MmVw==" }, - "id": "libvirt-47" + "id": "libvirt-45" } { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38944,7 +38918,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39345,7 +39319,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39359,7 +39333,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39760,7 +39734,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39775,7 +39749,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -40287,7 +40261,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies index fd1de1198e..73d9a1b313 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies @@ -38150,35 +38150,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -39701,16 +39675,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39719,11 +39693,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39738,7 +39712,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -40139,7 +40113,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -40153,7 +40127,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -40554,7 +40528,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -40569,7 +40543,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41081,7 +41055,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies index 79525a0da7..2c4dcb149e 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies @@ -36345,35 +36345,9 @@ "id": "libvirt-41" } -{ - "execute": "query-tpm-models", - "id": "libvirt-42" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-42" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-43" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-43" -} - { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-42" } { @@ -37707,16 +37681,16 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-42" } { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-43" } { - "id": "libvirt-45", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -37725,7 +37699,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37753,7 +37727,7 @@ ], "flc": true }, - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37764,7 +37738,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38169,7 +38143,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38183,7 +38157,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -38588,7 +38562,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -38599,7 +38573,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39115,7 +39089,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39130,7 +39104,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39646,7 +39620,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies index 27f56d62b8..8b8079617f 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies @@ -39024,35 +39024,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -40583,16 +40557,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -40601,11 +40575,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -40620,7 +40594,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -41025,7 +40999,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -41039,7 +41013,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -41444,7 +41418,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -41455,7 +41429,7 @@ "name": "host" } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41974,7 +41948,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41989,7 +41963,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-50" } { @@ -42508,7 +42482,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies index ecbec17817..c248bced28 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies @@ -28966,34 +28966,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -30116,7 +30091,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies index 8e889d7bbe..9b0d762799 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies @@ -30495,35 +30495,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -31843,16 +31817,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -31861,11 +31835,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -31880,7 +31854,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32213,7 +32187,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32227,7 +32201,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -32560,7 +32534,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -32575,7 +32549,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -32908,7 +32882,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies index bc08815d62..58a624b006 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies @@ -29558,34 +29558,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -30772,7 +30747,7 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies index cf18d9abb7..6f27d3a349 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies @@ -31092,35 +31092,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -32444,16 +32418,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -32462,7 +32436,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -32483,7 +32457,7 @@ } ] }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -32494,7 +32468,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32831,7 +32805,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32845,7 +32819,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33182,7 +33156,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33197,7 +33171,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -33534,7 +33508,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies index 78f794fd96..546214a9ef 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies @@ -30265,34 +30265,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -31479,7 +31454,7 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies index ef6d322490..fcee75b20a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies @@ -31796,35 +31796,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -33148,16 +33122,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33166,11 +33140,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -33185,7 +33159,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -33523,7 +33497,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -33537,7 +33511,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33875,7 +33849,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33890,7 +33864,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -34228,7 +34202,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies index 5e65d77589..a55685c8f0 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies @@ -30149,29 +30149,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31487,5 +31467,5 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies index 0b6bf1e80d..1095899c6e 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies @@ -32793,35 +32793,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -34145,16 +34119,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34163,11 +34137,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34182,7 +34156,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34520,7 +34494,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34534,7 +34508,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34872,7 +34846,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34887,7 +34861,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -35225,7 +35199,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies index ddc580f591..f87ebf41ee 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies @@ -32793,35 +32793,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -34145,16 +34119,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34163,11 +34137,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34182,7 +34156,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34520,7 +34494,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34534,7 +34508,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34872,7 +34846,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34887,7 +34861,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -35225,7 +35199,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies index cd624f5095..49faceec28 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies @@ -34352,35 +34352,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -35821,16 +35795,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -35839,11 +35813,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -35858,7 +35832,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -36201,7 +36175,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -36215,7 +36189,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -36558,7 +36532,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -36573,7 +36547,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -37022,7 +36996,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies index aa2fd62bc4..8a71843283 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -29155,29 +29155,9 @@ "id": "libvirt-34" } -{ - "execute": "query-tpm-models", - "id": "libvirt-35" -} - -{ - "return": [], - "id": "libvirt-35" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -30400,7 +30380,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -30411,7 +30391,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -30460,7 +30440,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index 06be5c2264..458d656220 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -35566,35 +35566,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37052,16 +37026,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37070,11 +37044,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37089,7 +37063,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -37452,7 +37426,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -37466,7 +37440,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -37829,7 +37803,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -37844,7 +37818,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -38313,7 +38287,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies index db5cb5750c..d1ca8b37f5 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies @@ -33337,35 +33337,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -34730,12 +34704,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34751,7 +34725,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34762,7 +34736,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-41" } { @@ -34795,7 +34769,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-41" } { @@ -34810,11 +34784,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-42" } { - "id": "libvirt-44", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Parameter 'hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies index d3617dac30..d28046578d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies @@ -33382,35 +33382,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -34892,12 +34866,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34913,7 +34887,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34924,11 +34898,11 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-41" } { - "id": "libvirt-43", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -34947,11 +34921,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-42" } { - "id": "libvirt-44", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies index f68e9fe3e1..7f2bb97635 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies @@ -28556,29 +28556,9 @@ "id": "libvirt-36" } -{ - "execute": "query-tpm-models", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-38" -} - -{ - "return": [], - "id": "libvirt-38" -} - { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -29893,7 +29873,7 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -29904,11 +29884,11 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { - "id": "libvirt-40", + "id": "libvirt-38", "error": { "class": "GenericError", "desc": "The CPU type 'host' is not a recognized LoongArch CPU type" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies index 70745a1550..492cef2065 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -29863,29 +29863,9 @@ "id": "libvirt-34" } -{ - "execute": "query-tpm-models", - "id": "libvirt-35" -} - -{ - "return": [], - "id": "libvirt-35" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -31116,7 +31096,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -31127,7 +31107,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31176,7 +31156,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies index cd16a62fdf..4b34b01eea 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies @@ -36258,35 +36258,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37757,16 +37731,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37775,11 +37749,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37794,7 +37768,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38161,7 +38135,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38175,7 +38149,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38542,7 +38516,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38557,7 +38531,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39030,7 +39004,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies index aa7a1be2b0..2d492d7b06 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies @@ -24763,29 +24763,9 @@ "id": "libvirt-20" } -{ - "execute": "query-tpm-models", - "id": "libvirt-21" -} - -{ - "return": [], - "id": "libvirt-21" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-22" -} - -{ - "return": [], - "id": "libvirt-22" -} - { "execute": "query-command-line-options", - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -26118,5 +26098,5 @@ "option": "drive" } ], - "id": "libvirt-23" + "id": "libvirt-21" } diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies index b9c5ccd8c0..6099885857 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies @@ -36482,35 +36482,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37985,16 +37959,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38003,11 +37977,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -38022,7 +37996,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38390,7 +38364,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38404,7 +38378,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38772,7 +38746,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38787,7 +38761,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39261,7 +39235,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies index 282edd6283..51896936cc 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies @@ -30023,34 +30023,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [ - "tpm-tis" - ], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31464,7 +31439,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31475,11 +31450,11 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { - "id": "libvirt-39", + "id": "libvirt-37", "error": { "class": "GenericError", "desc": "The requested expansion type is not supported" diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies index 8472bcf939..d8f0b032ba 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -30806,29 +30806,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32067,7 +32047,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32078,7 +32058,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32150,7 +32130,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32161,7 +32141,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -32233,7 +32213,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies index 12142fa24d..7c6c525d12 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies @@ -37172,35 +37172,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38683,16 +38657,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38701,11 +38675,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38720,7 +38694,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39098,7 +39072,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39112,7 +39086,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39490,7 +39464,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39505,7 +39479,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39993,7 +39967,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies index 104d1dae6c..66dcfe42d0 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies @@ -32516,34 +32516,9 @@ "id": "libvirt-33" } -{ - "execute": "query-tpm-models", - "id": "libvirt-34" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-34" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-35" -} - -{ - "return": [ - "emulator" - ], - "id": "libvirt-35" -} - { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -33859,12 +33834,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { "execute": "query-gic-capabilities", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -33880,7 +33855,7 @@ "kernel": false } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -33891,11 +33866,11 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -33914,11 +33889,11 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { - "id": "libvirt-39", + "id": "libvirt-37", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies index 2ec542154c..1a47f2b71b 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies @@ -31031,29 +31031,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32301,7 +32281,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32312,7 +32292,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32384,7 +32364,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32395,7 +32375,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -32536,7 +32516,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies index a2e33caacb..764b71bcdc 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies @@ -36824,35 +36824,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38365,12 +38339,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38381,16 +38355,16 @@ "pdh": "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", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD+qQRCYS9joBYSHMD1g+rmjY+MmVw==" }, - "id": "libvirt-47" + "id": "libvirt-45" } { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38405,7 +38379,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38805,7 +38779,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38819,7 +38793,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39219,7 +39193,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39234,7 +39208,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39745,7 +39719,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies index cea4cf7779..1b68825df6 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies @@ -37524,35 +37524,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -39045,16 +39019,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39063,11 +39037,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39082,7 +39056,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39482,7 +39456,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39496,7 +39470,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39896,7 +39870,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39911,7 +39885,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -40422,7 +40396,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { -- 2.51.0