[libvirt] [PATCH v2 22/31] tests: Update capabilities for QEMU 2.5.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 100 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 30 ++++++- 2 files changed, 127 insertions(+), 3 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 1ed8805..2eeed7d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -451,7 +451,7 @@ { "return": { - "fd": 14, + "fd": 16, "fdset-id": 0 }, "id": "libvirt-5" @@ -467,7 +467,7 @@ { "return": { - "enabled": false, + "enabled": true, "present": true }, "id": "libvirt-7" @@ -12147,3 +12147,99 @@ ], "id": "libvirt-47" } + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": [ + { + "name": "Opteron_G5" + }, + { + "name": "Opteron_G4" + }, + { + "name": "Opteron_G3" + }, + { + "name": "Opteron_G2" + }, + { + "name": "Opteron_G1" + }, + { + "name": "Broadwell" + }, + { + "name": "Broadwell-noTSX" + }, + { + "name": "Haswell" + }, + { + "name": "Haswell-noTSX" + }, + { + "name": "IvyBridge" + }, + { + "name": "SandyBridge" + }, + { + "name": "Westmere" + }, + { + "name": "Nehalem" + }, + { + "name": "Penryn" + }, + { + "name": "Conroe" + }, + { + "name": "n270" + }, + { + "name": "athlon" + }, + { + "name": "pentium3" + }, + { + "name": "pentium2" + }, + { + "name": "pentium" + }, + { + "name": "486" + }, + { + "name": "coreduo" + }, + { + "name": "kvm32" + }, + { + "name": "qemu32" + }, + { + "name": "kvm64" + }, + { + "name": "core2duo" + }, + { + "name": "phenom" + }, + { + "name": "qemu64" + } + ], + "id": "libvirt-2" +} diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 4dc2807..8cc3163 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -3,10 +3,10 @@ <selfctime>0</selfctime> <selfvers>0</selfvers> <usedQMP/> + <flag name='kvm'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> - <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> <flag name='netdev'/> @@ -191,6 +191,34 @@ <kvmVersion>0</kvmVersion> <package></package> <arch>x86_64</arch> + <cpu type='kvm' name='Opteron_G5'/> + <cpu type='kvm' name='Opteron_G4'/> + <cpu type='kvm' name='Opteron_G3'/> + <cpu type='kvm' name='Opteron_G2'/> + <cpu type='kvm' name='Opteron_G1'/> + <cpu type='kvm' name='Broadwell'/> + <cpu type='kvm' name='Broadwell-noTSX'/> + <cpu type='kvm' name='Haswell'/> + <cpu type='kvm' name='Haswell-noTSX'/> + <cpu type='kvm' name='IvyBridge'/> + <cpu type='kvm' name='SandyBridge'/> + <cpu type='kvm' name='Westmere'/> + <cpu type='kvm' name='Nehalem'/> + <cpu type='kvm' name='Penryn'/> + <cpu type='kvm' name='Conroe'/> + <cpu type='kvm' name='n270'/> + <cpu type='kvm' name='athlon'/> + <cpu type='kvm' name='pentium3'/> + <cpu type='kvm' name='pentium2'/> + <cpu type='kvm' name='pentium'/> + <cpu type='kvm' name='486'/> + <cpu type='kvm' name='coreduo'/> + <cpu type='kvm' name='kvm32'/> + <cpu type='kvm' name='qemu32'/> + <cpu type='kvm' name='kvm64'/> + <cpu type='kvm' name='core2duo'/> + <cpu type='kvm' name='phenom'/> + <cpu type='kvm' name='qemu64'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> -- 2.10.2