diff options
author | Jiri Denemark <jdenemar@redhat.com> | 2016-11-18 10:10:35 +0100 |
---|---|---|
committer | Jiri Denemark <jdenemar@redhat.com> | 2016-11-25 20:34:27 +0100 |
commit | 58c7620cdcb3ee5253864ff2ad11526f22eb2189 (patch) | |
tree | f75ebb162204b7179df0c71a3485426b87dcc5ab /tests | |
parent | c0bf82b6ab71aa2518d7477926a03f28320ebe1e (diff) | |
download | libvirt-58c7620cdcb3ee5253864ff2ad11526f22eb2189.tar.gz |
tests: Update capabilities for QEMU 1.7.0
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 4 | ||||
-rw-r--r-- | tests/domaincapstest.c | 2 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 88 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 26 |
4 files changed, 114 insertions, 6 deletions
diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml index 67f7ee82a5..4aa475c1e7 100644 --- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -1,6 +1,6 @@ <domainCapabilities> <path>/usr/bin/qemu-system-x86_64</path> - <domain>qemu</domain> + <domain>kvm</domain> <machine>pc-i440fx-1.7</machine> <arch>x86_64</arch> <vcpu max='255'/> @@ -19,7 +19,7 @@ </loader> </os> <cpu> - <mode name='host-passthrough' supported='no'/> + <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> <model fallback='allow'>Broadwell</model> </mode> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 74a16ce864..2ff489c904 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -413,7 +413,7 @@ mymain(void) DO_TEST_QEMU("1.7.0", "caps_1.7.0", "/usr/bin/qemu-system-x86_64", NULL, - "x86_64", VIR_DOMAIN_VIRT_QEMU); + "x86_64", VIR_DOMAIN_VIRT_KVM); DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-x86_64", NULL, diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 4df07ebaf8..416ece1afb 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -343,7 +343,7 @@ { "return": { - "fd": 11, + "fd": 13, "fdset-id": 0 }, "id": "libvirt-5" @@ -359,7 +359,7 @@ { "return": { - "enabled": false, + "enabled": true, "present": true }, "id": "libvirt-7" @@ -3131,3 +3131,87 @@ ], "id": "libvirt-46" } + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": [ + { + "name": "Opteron_G5" + }, + { + "name": "Opteron_G4" + }, + { + "name": "Opteron_G3" + }, + { + "name": "Opteron_G2" + }, + { + "name": "Opteron_G1" + }, + { + "name": "Haswell" + }, + { + "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_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 3614bbba04..1323a0cf73 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.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'/> @@ -151,6 +151,30 @@ <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='Haswell'/> + <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'/> |