qemu: Add QEMU_CAPS_DEVICE_ISA_SERIAL

All serial devices shoule have an associated capability.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Andrea Bolognani 2017-11-26 17:19:46 +01:00
parent 220c1f70dc
commit b0f1c291a0
24 changed files with 29 additions and 0 deletions

View File

@ -452,6 +452,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"numa.dist",
"disk-share-rw",
"iscsi.password-secret",
"isa-serial",
);
@ -1682,6 +1683,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO },
{ "spapr-vty", QEMU_CAPS_DEVICE_SPAPR_VTY },
{ "sclplmconsole", QEMU_CAPS_DEVICE_SCLPLMCONSOLE },
{ "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {

View File

@ -438,6 +438,7 @@ typedef enum {
QEMU_CAPS_NUMA_DIST, /* -numa dist */
QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;

View File

@ -109,6 +109,7 @@
<flag name='device-tray-moved-event'/>
<flag name='display'/>
<flag name='query-cpu-definitions'/>
<flag name='isa-serial'/>
<version>1002002</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -127,6 +127,7 @@
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<flag name='query-cpu-definitions'/>
<flag name='isa-serial'/>
<version>1003001</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -128,6 +128,7 @@
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<flag name='query-cpu-definitions'/>
<flag name='isa-serial'/>
<version>1004002</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -140,6 +140,7 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
<flag name='isa-serial'/>
<version>1005003</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -145,6 +145,7 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
<flag name='isa-serial'/>
<version>1006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -147,6 +147,7 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
<flag name='isa-serial'/>
<version>1007000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -163,6 +163,7 @@
<flag name='query-cpu-definitions'/>
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='isa-serial'/>
<version>2001001</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -183,6 +183,7 @@
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.10.0)</package>

View File

@ -183,6 +183,7 @@
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.10.0)</package>

View File

@ -182,6 +182,7 @@
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.10.0)</package>

View File

@ -227,6 +227,7 @@
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.10.0)</package>

View File

@ -188,6 +188,7 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/>
<version>2004000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -194,6 +194,7 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -172,6 +172,7 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -172,6 +172,7 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -168,6 +168,7 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='spapr-vty'/>
<flag name='isa-serial'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -204,6 +204,7 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

View File

@ -208,6 +208,7 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='isa-serial'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.7.0)</package>

View File

@ -210,6 +210,7 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='isa-serial'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.8.0)</package>

View File

@ -176,6 +176,7 @@
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.9.0)</package>

View File

@ -223,6 +223,7 @@
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.9.0)</package>

View File

@ -174,6 +174,7 @@ mymain(void)
QEMU_CAPS_DEVICE_USB_KBD,
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
@ -210,6 +211,7 @@ mymain(void)
QEMU_CAPS_DEVICE_USB_KBD,
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
@ -258,6 +260,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IVSHMEM,
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-1.0", 1000000, 0, 0,
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
@ -328,6 +331,7 @@ mymain(void)
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DISPLAY);
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
@ -411,6 +415,7 @@ mymain(void)
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DISPLAY);
DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
QEMU_CAPS_LAST);