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

qemu: Drop QEMU_CAPS_INCOMING_DEFER

The capability is not used anymore since "-incoming defer" is supported
by all QEMU versions we care about.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Jiri Denemark 2022-04-07 18:04:38 +02:00
parent fa9c730bdd
commit 74884bef1e
36 changed files with 2 additions and 37 deletions

View File

@ -348,7 +348,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"e1000", /* QEMU_CAPS_DEVICE_E1000 */ "e1000", /* QEMU_CAPS_DEVICE_E1000 */
"virtio-net", /* QEMU_CAPS_DEVICE_VIRTIO_NET */ "virtio-net", /* QEMU_CAPS_DEVICE_VIRTIO_NET */
"gic-version", /* QEMU_CAPS_MACH_VIRT_GIC_VERSION */ "gic-version", /* QEMU_CAPS_MACH_VIRT_GIC_VERSION */
"incoming-defer", /* QEMU_CAPS_INCOMING_DEFER */ "incoming-defer", /* X_QEMU_CAPS_INCOMING_DEFER */
"virtio-gpu", /* QEMU_CAPS_DEVICE_VIRTIO_GPU */ "virtio-gpu", /* QEMU_CAPS_DEVICE_VIRTIO_GPU */
/* 200 */ /* 200 */
@ -1207,7 +1207,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
{ "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
{ "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
{ "migrate-incoming", QEMU_CAPS_INCOMING_DEFER },
{ "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
{ "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
{ "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },

View File

@ -322,7 +322,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_E1000, /* -device e1000 */ QEMU_CAPS_DEVICE_E1000, /* -device e1000 */
QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */ QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */
QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */
QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */ X_QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */
QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */ QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */
/* 200 */ /* 200 */

View File

@ -61,7 +61,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -85,7 +85,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -69,7 +69,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -66,7 +66,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -70,7 +70,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -70,7 +70,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -38,7 +38,6 @@
<flag name='dea-key-wrap'/> <flag name='dea-key-wrap'/>
<flag name='migration-event'/> <flag name='migration-event'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -70,7 +70,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -66,7 +66,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -38,7 +38,6 @@
<flag name='dea-key-wrap'/> <flag name='dea-key-wrap'/>
<flag name='migration-event'/> <flag name='migration-event'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -85,7 +85,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -72,7 +72,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -67,7 +67,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -70,7 +70,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -85,7 +85,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -26,7 +26,6 @@
<flag name='iothread'/> <flag name='iothread'/>
<flag name='migrate-rdma'/> <flag name='migrate-rdma'/>
<flag name='migration-event'/> <flag name='migration-event'/>
<flag name='incoming-defer'/>
<flag name='chardev-file-append'/> <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/> <flag name='vserport-change-event'/>
<flag name='spice-gl'/> <flag name='spice-gl'/>

View File

@ -85,7 +85,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -71,7 +71,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -66,7 +66,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -69,7 +69,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -37,7 +37,6 @@
<flag name='dea-key-wrap'/> <flag name='dea-key-wrap'/>
<flag name='migration-event'/> <flag name='migration-event'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -85,7 +85,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -70,7 +70,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -37,7 +37,6 @@
<flag name='dea-key-wrap'/> <flag name='dea-key-wrap'/>
<flag name='migration-event'/> <flag name='migration-event'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-gpu.virgl'/> <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -75,7 +75,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -66,7 +66,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -75,7 +75,6 @@
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='gic-version'/> <flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -72,7 +72,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>

View File

@ -84,7 +84,6 @@
<flag name='rtl8139'/> <flag name='rtl8139'/>
<flag name='e1000'/> <flag name='e1000'/>
<flag name='virtio-net'/> <flag name='virtio-net'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/> <flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/> <flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/> <flag name='virtio-mouse'/>