You need to sign in or sign up before continuing.
提交 0ba2b9d3 编写于 作者: J Jiri Denemark

tests: Update capabilities for QEMU 1.3.1

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
上级 79b898e3
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
{ {
"return": { "return": {
"fd": 11, "fd": 13,
"fdset-id": 0 "fdset-id": 0
}, },
"id": "libvirt-5" "id": "libvirt-5"
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
{ {
"return": { "return": {
"enabled": false, "enabled": true,
"present": true "present": true
}, },
"id": "libvirt-7" "id": "libvirt-7"
...@@ -2087,3 +2087,87 @@ ...@@ -2087,3 +2087,87 @@
], ],
"id": "libvirt-46" "id": "libvirt-46"
} }
{
"return": {
},
"id": "libvirt-1"
}
{
"return": [
{
"name": "qemu64"
},
{
"name": "phenom"
},
{
"name": "core2duo"
},
{
"name": "kvm64"
},
{
"name": "qemu32"
},
{
"name": "kvm32"
},
{
"name": "coreduo"
},
{
"name": "486"
},
{
"name": "pentium"
},
{
"name": "pentium2"
},
{
"name": "pentium3"
},
{
"name": "athlon"
},
{
"name": "n270"
},
{
"name": "Conroe"
},
{
"name": "Penryn"
},
{
"name": "Nehalem"
},
{
"name": "Westmere"
},
{
"name": "SandyBridge"
},
{
"name": "Haswell"
},
{
"name": "Opteron_G1"
},
{
"name": "Opteron_G2"
},
{
"name": "Opteron_G3"
},
{
"name": "Opteron_G4"
},
{
"name": "Opteron_G5"
}
],
"id": "libvirt-2"
}
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<selfctime>0</selfctime> <selfctime>0</selfctime>
<selfvers>0</selfvers> <selfvers>0</selfvers>
<usedQMP/> <usedQMP/>
<flag name='kvm'/>
<flag name='mem-path'/> <flag name='mem-path'/>
<flag name='drive-serial'/> <flag name='drive-serial'/>
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='netdev'/> <flag name='netdev'/>
...@@ -132,6 +132,30 @@ ...@@ -132,6 +132,30 @@
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<package></package> <package></package>
<arch>x86_64</arch> <arch>x86_64</arch>
<cpu type='kvm' name='qemu64'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='kvm64'/>
<cpu type='kvm' name='qemu32'/>
<cpu type='kvm' name='kvm32'/>
<cpu type='kvm' name='coreduo'/>
<cpu type='kvm' name='486'/>
<cpu type='kvm' name='pentium'/>
<cpu type='kvm' name='pentium2'/>
<cpu type='kvm' name='pentium3'/>
<cpu type='kvm' name='athlon'/>
<cpu type='kvm' name='n270'/>
<cpu type='kvm' name='Conroe'/>
<cpu type='kvm' name='Penryn'/>
<cpu type='kvm' name='Nehalem'/>
<cpu type='kvm' name='Westmere'/>
<cpu type='kvm' name='SandyBridge'/>
<cpu type='kvm' name='Haswell'/>
<cpu type='kvm' name='Opteron_G1'/>
<cpu type='kvm' name='Opteron_G2'/>
<cpu type='kvm' name='Opteron_G3'/>
<cpu type='kvm' name='Opteron_G4'/>
<cpu type='kvm' name='Opteron_G5'/>
<cpu type='tcg' name='qemu64'/> <cpu type='tcg' name='qemu64'/>
<cpu type='tcg' name='phenom'/> <cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='core2duo'/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册