1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-11-20 23:28:09 +01:00
parent 73411a7ff1
commit f8b7b075b6
4 changed files with 151 additions and 17 deletions

View File

@ -1,6 +1,6 @@
<domainCapabilities> <domainCapabilities>
<path>/usr/bin/qemu-system-aarch64</path> <path>/usr/bin/qemu-system-aarch64</path>
<domain>qemu</domain> <domain>kvm</domain>
<machine>virt-2.6</machine> <machine>virt-2.6</machine>
<arch>aarch64</arch> <arch>aarch64</arch>
<vcpu max='255'/> <vcpu max='255'/>
@ -19,7 +19,7 @@
</loader> </loader>
</os> </os>
<cpu> <cpu>
<mode name='host-passthrough' supported='no'/> <mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='no'/> <mode name='host-model' supported='no'/>
<mode name='custom' supported='yes'> <mode name='custom' supported='yes'>
<model usable='unknown'>pxa262</model> <model usable='unknown'>pxa262</model>
@ -108,7 +108,7 @@
<features> <features>
<gic supported='yes'> <gic supported='yes'>
<enum name='version'> <enum name='version'>
<value>2</value> <value>3</value>
</enum> </enum>
</gic> </gic>
</features> </features>

View File

@ -429,7 +429,7 @@ mymain(void)
DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3", DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
"/usr/bin/qemu-system-aarch64", "virt", "/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_QEMU); "aarch64", VIR_DOMAIN_VIRT_KVM);
DO_TEST_QEMU("2.6.0", "caps_2.6.0", DO_TEST_QEMU("2.6.0", "caps_2.6.0",
"/usr/bin/qemu-system-ppc64", NULL, "/usr/bin/qemu-system-ppc64", NULL,

View File

@ -2,8 +2,8 @@
"QMP": { "QMP": {
"version": { "version": {
"qemu": { "qemu": {
"micro": 94, "micro": 0,
"minor": 5, "minor": 6,
"major": 2 "major": 2
}, },
"package": "" "package": ""
@ -22,8 +22,8 @@
{ {
"return": { "return": {
"qemu": { "qemu": {
"micro": 94, "micro": 0,
"minor": 5, "minor": 6,
"major": 2 "major": 2
}, },
"package": "" "package": ""
@ -454,7 +454,7 @@
{ {
"return": { "return": {
"fd": 15, "fd": 17,
"fdset-id": 0 "fdset-id": 0
}, },
"id": "libvirt-5" "id": "libvirt-5"
@ -470,7 +470,7 @@
{ {
"return": { "return": {
"enabled": false, "enabled": true,
"present": true "present": true
}, },
"id": "libvirt-7" "id": "libvirt-7"
@ -1525,6 +1525,9 @@
{ {
"name": "digic-uart" "name": "digic-uart"
}, },
{
"name": "host-arm-cpu"
},
{ {
"name": "i82557c" "name": "i82557c"
}, },
@ -3423,11 +3426,6 @@
"description": "on/off", "description": "on/off",
"type": "bool" "type": "bool"
}, },
{
"name": "stats",
"description": "on/off",
"type": "bool"
},
{ {
"name": "max_outputs", "name": "max_outputs",
"type": "uint32" "type": "uint32"
@ -3886,6 +3884,9 @@
{ {
"name": "cortex-a53" "name": "cortex-a53"
}, },
{
"name": "host"
},
{ {
"name": "sa1100" "name": "sa1100"
}, },
@ -12970,3 +12971,105 @@
], ],
"id": "libvirt-48" "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"
}

View File

@ -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'/>
@ -163,10 +163,41 @@
<flag name='ivshmem-doorbell'/> <flag name='ivshmem-doorbell'/>
<flag name='query-qmp-schema'/> <flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/> <flag name='vhost-scsi'/>
<version>2005094</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<package></package> <package></package>
<arch>aarch64</arch> <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='pxa262'/>
<cpu type='tcg' name='pxa270-a0'/> <cpu type='tcg' name='pxa270-a0'/>
<cpu type='tcg' name='arm1136'/> <cpu type='tcg' name='arm1136'/>