提交 451dc193 编写于 作者: J Jiri Denemark

tests: Update capabilities for QEMU 2.6.0 (aarch64, GICv2)

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
上级 e6bad6b6
<domainCapabilities>
<path>/usr/bin/qemu-system-aarch64</path>
<domain>qemu</domain>
<domain>kvm</domain>
<machine>virt-2.6</machine>
<arch>aarch64</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='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
......@@ -38,6 +38,7 @@
<model usable='unknown'>sa1110</model>
<model usable='unknown'>arm1176</model>
<model usable='unknown'>cortex-a53</model>
<model usable='unknown'>host</model>
<model usable='unknown'>sa1100</model>
<model usable='unknown'>pxa270-c5</model>
<model usable='unknown'>cortex-a9</model>
......
<domainCapabilities>
<path>/usr/bin/qemu-system-aarch64</path>
<domain>qemu</domain>
<domain>kvm</domain>
<machine>integratorcp</machine>
<arch>aarch64</arch>
<vcpu max='1'/>
......@@ -19,7 +19,7 @@
</loader>
</os>
<cpu>
<mode name='host-passthrough' supported='no'/>
<mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model>
......@@ -38,6 +38,7 @@
<model usable='unknown'>sa1110</model>
<model usable='unknown'>arm1176</model>
<model usable='unknown'>cortex-a53</model>
<model usable='unknown'>host</model>
<model usable='unknown'>sa1100</model>
<model usable='unknown'>pxa270-c5</model>
<model usable='unknown'>cortex-a9</model>
......
......@@ -421,11 +421,11 @@ mymain(void)
DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
"/usr/bin/qemu-system-aarch64", NULL,
"aarch64", VIR_DOMAIN_VIRT_QEMU);
"aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2",
"/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_QEMU);
"aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
"/usr/bin/qemu-system-aarch64", "virt",
......
......@@ -454,7 +454,7 @@
{
"return": {
"fd": 15,
"fd": 17,
"fdset-id": 0
},
"id": "libvirt-5"
......@@ -470,7 +470,7 @@
{
"return": {
"enabled": false,
"enabled": true,
"present": true
},
"id": "libvirt-7"
......@@ -1525,6 +1525,9 @@
{
"name": "digic-uart"
},
{
"name": "host-arm-cpu"
},
{
"name": "i82557c"
},
......@@ -3881,6 +3884,9 @@
{
"name": "cortex-a53"
},
{
"name": "host"
},
{
"name": "sa1100"
},
......@@ -12965,3 +12971,105 @@
],
"id": "libvirt-48"
}
{
"return": {
},
"id": "libvirt-1"
}
{
"return": [
{
"name": "pxa262"
},
{
"name": "pxa270-a0"
},
{
"name": "arm1136"
},
{
"name": "cortex-a15"
},
{
"name": "pxa260"
},
{
"name": "arm1136-r2"
},
{
"name": "pxa261"
},
{
"name": "pxa255"
},
{
"name": "arm926"
},
{
"name": "arm11mpcore"
},
{
"name": "pxa250"
},
{
"name": "ti925t"
},
{
"name": "cortex-a57"
},
{
"name": "sa1110"
},
{
"name": "arm1176"
},
{
"name": "cortex-a53"
},
{
"name": "sa1100"
},
{
"name": "pxa270-c5"
},
{
"name": "cortex-a9"
},
{
"name": "cortex-a8"
},
{
"name": "pxa270-c0"
},
{
"name": "arm1026"
},
{
"name": "pxa270-b1"
},
{
"name": "cortex-m3"
},
{
"name": "cortex-m4"
},
{
"name": "pxa270-b0"
},
{
"name": "arm946"
},
{
"name": "cortex-r5"
},
{
"name": "pxa270-a1"
},
{
"name": "pxa270"
}
],
"id": "libvirt-2"
}
......@@ -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'/>
......@@ -167,6 +167,37 @@
<kvmVersion>0</kvmVersion>
<package></package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
<cpu type='kvm' name='pxa270-a0'/>
<cpu type='kvm' name='arm1136'/>
<cpu type='kvm' name='cortex-a15'/>
<cpu type='kvm' name='pxa260'/>
<cpu type='kvm' name='arm1136-r2'/>
<cpu type='kvm' name='pxa261'/>
<cpu type='kvm' name='pxa255'/>
<cpu type='kvm' name='arm926'/>
<cpu type='kvm' name='arm11mpcore'/>
<cpu type='kvm' name='pxa250'/>
<cpu type='kvm' name='ti925t'/>
<cpu type='kvm' name='cortex-a57'/>
<cpu type='kvm' name='sa1110'/>
<cpu type='kvm' name='arm1176'/>
<cpu type='kvm' name='cortex-a53'/>
<cpu type='kvm' name='host'/>
<cpu type='kvm' name='sa1100'/>
<cpu type='kvm' name='pxa270-c5'/>
<cpu type='kvm' name='cortex-a9'/>
<cpu type='kvm' name='cortex-a8'/>
<cpu type='kvm' name='pxa270-c0'/>
<cpu type='kvm' name='arm1026'/>
<cpu type='kvm' name='pxa270-b1'/>
<cpu type='kvm' name='cortex-m3'/>
<cpu type='kvm' name='cortex-m4'/>
<cpu type='kvm' name='pxa270-b0'/>
<cpu type='kvm' name='arm946'/>
<cpu type='kvm' name='cortex-r5'/>
<cpu type='kvm' name='pxa270-a1'/>
<cpu type='kvm' name='pxa270'/>
<cpu type='tcg' name='pxa262'/>
<cpu type='tcg' name='pxa270-a0'/>
<cpu type='tcg' name='arm1136'/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册