]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Drop QEMU_CAPS_INCOMING_DEFER
authorJiri Denemark <jdenemar@redhat.com>
Thu, 7 Apr 2022 16:04:38 +0000 (18:04 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 8 Apr 2022 08:27:02 +0000 (10:27 +0200)
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>
36 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml

index 33d1f932043484a569f30e75f3ca56b6bbf3ba48..faf868e076973f07b58463ce14d9899481ae23cf 100644 (file)
@@ -348,7 +348,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "e1000", /* QEMU_CAPS_DEVICE_E1000 */
               "virtio-net", /* QEMU_CAPS_DEVICE_VIRTIO_NET */
               "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 */
 
               /* 200 */
@@ -1207,7 +1207,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
     { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
     { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
-    { "migrate-incoming", QEMU_CAPS_INCOMING_DEFER },
     { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
     { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
     { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
index b71336d78f3f40e9a6b16c58a9f3da0e46a3ed18..b7bf47c51e5078411c9a8881895b929e87d25a6c 100644 (file)
@@ -322,7 +322,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_E1000, /* -device e1000 */
     QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */
     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-* */
 
     /* 200 */
index 44c502a57082e9aeba04c03070f18d8abc67a1be..5b6c1510a7ac0c6a5c6ebb110fb5ef36f0065393 100644 (file)
@@ -61,7 +61,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 528bfc056596c713b6a5ab667aa927d98d791f6e..8ca3ac48fe188f8d514ecb5404e7d2812eb1bb74 100644 (file)
@@ -85,7 +85,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index b1b4a01b38b5aa89d34e3617de113b35287cf746..5adf904fc4577336f05f947c0e8a4adb054fbe92 100644 (file)
@@ -69,7 +69,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 73ebeac373627f0b11bc08ec881af6aac2375430..f60aeb5f40955fc6e8fe3a89eb73a86097b754d9 100644 (file)
@@ -66,7 +66,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 051e5a27f401a7c171088dfb07bb6d3ce1dffc7e..c494254c4da659a85df236b1523ead612e3665de 100644 (file)
@@ -70,7 +70,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 9286851bda8523abfdc264b06959f08280ad96ba..d2582fa297bd42428c102e70006f18b47aad90eb 100644 (file)
@@ -70,7 +70,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index a2245f39df32d56c98161b48482e49f82bc73f7d..4f36186044b2d95318621adfe295fe267d956a03 100644 (file)
@@ -38,7 +38,6 @@
   <flag name='dea-key-wrap'/>
   <flag name='migration-event'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index aa680a401b12ca0b0b14d6cc63229e90db4119b8..18e5ebd4f4ba73823349ad017a856d111d9770e8 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 8d51f643671dd33c04ac95a94c21332692557672..12c5ebe6f3e5c151907b148dd213c28540265552 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index ec547c3a4be5b395566820ae2f0e436af72b1205..ee536b7b634cb89a014156adb9f6550c98f0e3e8 100644 (file)
@@ -70,7 +70,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index af33c81cb2918aad8a5ef098cba0add9aeda15d8..99d1c79dd40f6df08a8ec4ab28f85e1c3facd2aa 100644 (file)
@@ -66,7 +66,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index d287e792ae7c1f5468473c7b7c976524dfbb930b..069777a49b4e9935e00f0b7740a3932d6b434b8e 100644 (file)
@@ -38,7 +38,6 @@
   <flag name='dea-key-wrap'/>
   <flag name='migration-event'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 380006220bad7d5be6243acc58c68a6e0f83e020..6b61214a0b517d86f04deb90525cf802672a37fc 100644 (file)
@@ -85,7 +85,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 7a08db471ed76f585e6f41de484f9810e142f8f8..4fd02e786dab9b7ddba44a897a9df6451f1f1d51 100644 (file)
@@ -72,7 +72,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 2a1c77b73ee689d5017361cdd4eabf8de68fc992..2dd66410d1758079bdc368f05af048ae2b72299c 100644 (file)
@@ -67,7 +67,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index dc998ad4df220d9dd58fffce4079d2f3f6c52a0b..557949d6d630b786e906ab7a387bdd59e82377d6 100644 (file)
@@ -70,7 +70,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index f52df9a8209e41804d0c2ab68a0278be52931b59..f301d8a92626254f36a5556157f450e6cd37d1d7 100644 (file)
@@ -85,7 +85,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 5dc12846dba94f912316fe5d3a85a14a7cd501f8..3a330ebdc0c6bdd5307e8288531bba1eddcd7d3c 100644 (file)
@@ -26,7 +26,6 @@
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='migration-event'/>
-  <flag name='incoming-defer'/>
   <flag name='chardev-file-append'/>
   <flag name='vserport-change-event'/>
   <flag name='spice-gl'/>
index a72832f045dcbae9d0cefb6347e3940378c5741b..53fcbf3417dde5ed4f76d39b4eae33288d598f72 100644 (file)
@@ -85,7 +85,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index f0c90d25d6492d64b9f375347bcb570969e169d2..824224302c66572d7f3fab87302869c071f57f20 100644 (file)
@@ -71,7 +71,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 3e55b4321ba8cf5d68c03b46700c002ef46dcc13..1c3121714df91960c3f8edf1e0a48329845e2448 100644 (file)
@@ -66,7 +66,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 0c550cd64744f5315dc849447eacd03b729ea79c..873923992d278356190ffcf5d4203e0dd08c72cf 100644 (file)
@@ -69,7 +69,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 517e8c1a93aea42737f1c1bcb148f046a9677d2e..5e9560d7b7d370495b401bd8e2eb6765b40aea58 100644 (file)
@@ -37,7 +37,6 @@
   <flag name='dea-key-wrap'/>
   <flag name='migration-event'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 7c818c6e2af4e6e91e1e6c6bd06f97c48d74de40..3998da92530cff065f2a2232095bfe8d98166066 100644 (file)
@@ -85,7 +85,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index d88e8d2723c82a9cceb1a62ec9134472e0fa4e14..51d3628eeb9729884068b36661e164a85116d139 100644 (file)
@@ -70,7 +70,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 5a6f5bc1e788f2e967dfc52b527925c29dd0d941..2e5d0f197a5d29e441e6ab2b9d9b1e726b0134de 100644 (file)
@@ -37,7 +37,6 @@
   <flag name='dea-key-wrap'/>
   <flag name='migration-event'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index 84ef615fffd8fdeba8397089e0bda581d6f67a29..3498d6255b137154b8cd4a0ca6c1b4a521c5048f 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
index bfdd72b790bd6566c240003dc4067893d59b70f4..ddeca62290c287a8916ad65174caf3034d07b51e 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 0ca2dae5e522f3bc3564b2ceac22ff0ccdc5f05f..553894037223c84c296d5906a6b0937045d7250a 100644 (file)
@@ -75,7 +75,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 59c08bbc3810ec6d70ecfb5ebe12bd450591825c..bec10e00e0b0f1030a954fe5cd18e24237c8f4d3 100644 (file)
@@ -66,7 +66,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 17ceb00ec30bc9cf45457d1b0f6a81247ac6671b..dba5ecaf87f303055fb174008e33519fabdf3e78 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index b97d4561de249bbde23728fb2c874e0d4cec3390..257b0f625d34f61baa4e722c0b6964c295410923 100644 (file)
@@ -75,7 +75,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index 320d9572e5c55a4f3ddae5a3945c472dcbfad160..5a502392dfb229ab16b12e92a148e740b9c186f2 100644 (file)
@@ -72,7 +72,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
index cb3e80740984ce26ab25851bb251b223d8270d87..87f9b4068d25c224086e7b0f2f2a3695d8bad165 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>