External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Introduce capabilities for virtio input ccw devices

Browse Source 
QEMU on S390 (since v2.11) can support virtio input ccw devices.
Introduce qemu capabilities for these devices.

Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
This commit is contained in:
Farhan Ali 2018-03-23 13:22:41 -04:00 committed by Ján Tomko
parent 2a0c3490dd
commit f79e38795e
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -461,6 +461,11 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"machine.pseries.max-cpu-compat",
"dump-completed",
"virtio-gpu-ccw",
"virtio-keyboard-ccw",
/* 285 */
"virtio-mouse-ccw",
"virtio-tablet-ccw",
);
@ -1697,6 +1702,9 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
{ "pl011", QEMU_CAPS_DEVICE_PL011 },
{ "virtio-gpu-ccw", QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
{ "virtio-keyboard-ccw", QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW },
{ "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {

5
src/qemu/qemu_capabilities.h
View File

@ -445,6 +445,11 @@ typedef enum {
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */
QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */
/* 285 */
QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */
QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;

3
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -147,6 +147,9 @@
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
<flag name='virtio-mouse-ccw'/>
<flag name='virtio-tablet-ccw'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>342058</microcodeVersion>

3
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -147,6 +147,9 @@
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
<flag name='virtio-mouse-ccw'/>
<flag name='virtio-tablet-ccw'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>