qemu: capabilities: Retire QEMU_CAPS_SPLASH_TIMEOUT

The code assumes that the feature tracked by this capability always
exists.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8f4f2d7de5c204ae9ef61ae695ea0fd036f3359a..1843ed99adab8ace32e98ab5c2ab1437b88a2e6c 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -308,7 +308,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "memory-backend-file", /* QEMU_CAPS_OBJECT_MEMORY_FILE */
               "usb-audio", /* QEMU_CAPS_OBJECT_USB_AUDIO */
               "rtc-reset-reinjection", /* QEMU_CAPS_RTC_RESET_REINJECTION */
-              "splash-timeout", /* QEMU_CAPS_SPLASH_TIMEOUT */
+              "splash-timeout", /* X_QEMU_CAPS_SPLASH_TIMEOUT */
               "iothread", /* QEMU_CAPS_OBJECT_IOTHREAD */
 
               /* 175 */
@@ -3205,7 +3205,6 @@ struct virQEMUCapsCommandLineProps {
  * in qemu and thus isn't being properly extended. Other means to detect
  * features should be used if possible. */
 static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
-    { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT },
     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
     { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
     { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e6123127516535fbedaf1b84decde811e462378b..973a1e747e5852e555d853ae285a36e13bbe530b 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -287,7 +287,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */
     QEMU_CAPS_OBJECT_USB_AUDIO, /* usb-audio device support */
     QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor command */
-    QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */
+    X_QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */
     QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */
 
     /* 175 */

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index d4095da18304eefb038e63416af61da6c0138907..fa770b65df4ae467f1c3d355bcfdff44835a0c92 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 57a5d1a585027988abe1ef58965ed8e605d78190..93c2a6d1b64f45bc430770323c590317a05b81a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -75,7 +75,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index d50aa8651d818e7c19f39052d936fc87fd6349f3..a0c9ee469c602e7601054d3c8c549d92cdf6cf0b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -56,7 +56,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 2e161ea1b0e84ff2821f48bc0f0ebfe93bfcb0aa..47c046334e1f3e715289dfbf6fbdb2df078b4673 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -55,7 +55,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 8cc5875b7426c4da69d260021953d6570d1ac12b..70bc9be6bdb3279055334596e36cfc18ec8bf40c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 9d0f7e43fd4a8bbeab435cb2165bbdf95725546c..0afe896105ed667a32a1cf860078aa5e95376ccf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -75,7 +75,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 25deb650519cade783be515a031bb467cacd8da1..33088ee25787945e05b412b47dad3f1b40f26abc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -54,7 +54,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 95b5e0b3ab9542d5a59409e42f35757951c252e4..17537f168af8e5eee0010c37e033c1e8cf21a732 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -25,7 +25,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 4739419824664eaa4fd9ad5c18cc3686f0ac41e7..4b1c1f3bcfd1e6a6219c873dba38aa5cc8c6831b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -25,7 +25,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 17e322de1f5e3dffad8d3264f3e0f63c521002a9..f2566ffd74a0f0e3218347c06adc394eff6a883d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index b62f2723ce8a96f816a92d1684924d214316b291..3889b820fb5f65d5562bc11d33e99ff72097c158 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -74,7 +74,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index b2dd89696103d0cc165b082c4bd087589fc6e255..211e58b6f23f4acf62aa26b4e76363c4ff00b1f3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -55,7 +55,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 9d2e4f4bceab8b752c388ae7a52355ff52aff796..159eef1593b5d5e883f82a73b3cf0f9109334e44 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -74,7 +74,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='ivshmem'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 6b6f83e34777942cb05ad2eff0d3a51716f97bec..26c3bc830e09439a129cf7b9434dec56aa003e5a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -58,7 +58,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 06a948e817de36adadad6c629f982420cc12b3e7..6d5792e75bbd65c5028a453812bb4c6fb90e252b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -57,7 +57,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index a7e7c344be376fa1ad25e6065b7974cedd120d95..e7c133be4f0ef4d1b71426a019f320a1c85499ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -62,7 +62,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 9f5b2eacd14975892793d69ef9fb7caefd350fac..232bcebe533697b79c90d22667d1bbd6d592d00f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -62,7 +62,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 534951e396564ae1f92d8794727fc40086ed6d6a..2f2680613dbda2ead8ca681ce9907f80f7f77893 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 49a7f0d20c4dd3676cdafaf269115c352adbaa65..e872586554c779b8f8dab86c16a5c49dc298b737 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -74,7 +74,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 304d878449e9fac21013e64b5280eb699048a01c..54565a0d5e1cc87e72141b772c268830b8ea4a2a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -74,7 +74,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index dc70e7e56982803f9f2f5178a9d1f4a62feca5d4..57c0d772d5c5eb86bd0f680bb66c78571444acfc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -58,7 +58,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 39667632c0d8a8a9c0eba4e3bf322dd7c22be283..59730ce1f5da7d5dd692b3eb047ff165fd44eca5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -57,7 +57,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 34ffd3f79d17c0366c6d0919def810427cf57a9b..5fa5700a08d4d5942fd3fef0b2ac9fdedd6b3d31 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 91d358c083fee3f1101ee6e32ef45e7bff2b467a..02dfde8a52aa9f9f06e2e9b331f7a6e9ae1bc6d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -75,7 +75,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 71c0fbb5c37d01a01c45422bd2aae85d6f929d2c..226d0f461d8c459f38199af9dd8857f183568ad0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -60,7 +60,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index f8175afea336d31acf15884e5411f428949a0a34..4282cc7de26fb8c3db22e2198b2df73864a17c11 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -58,7 +58,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index e665171f7c8f58cc899df6095a108a15c0e8f56b..b4962a5b8da7a7494e3e660ece3d26280f3a8666 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -62,7 +62,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 4c92c3cfa407f53828ade50d7eef939d012b1a02..85327e7f4f02fc01bc9fa7c096ff8a0880d11e35 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -75,7 +75,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 12ca20d06d2ea11866eecde8e264106eb058d263..4407d94de892984ce340c8f5c7ac2867783a486b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -25,7 +25,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 833711b6ad0d9d725bfbfcde4fe09835c0fd6e77..dc3a10a68413d18d846498d8d70fef1e00b045c9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -75,7 +75,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 87ae4512896bdb6e18f6fe4e3f8c527b2390bd8d..7cb81b5dc695241996801d94a7a2a2e4671a8de9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -59,7 +59,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index a9201f10b249b9201c8dfbb630d047d1b9785e5e..f27aab083279f0064f28fd293a07cd28d70870fd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -57,7 +57,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1b33b672c313f1a4e8a7f5bbafbb846bda366b65..bf2eef88744e3c6f14a8432e15ba2526b22e22cb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -61,7 +61,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 923a9adc49b45663d88d68cae7f897c660ea5369..44b84d2ca051f01b264dff5540c04498464acc4c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 76273c8f2b1ba951b2ed751e0c625a5e03540a32..8be1677e664611fecd97c17a41a6fc337509e0bb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -74,7 +74,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index f9c1514c8f6a819cd3f3f263a584d3e88f4f358b..d97cd365e37375ed5453c708771a14f093a055ee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -58,7 +58,6 @@
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 2b9c8fc714b7d8b9854e4ebbc916893b35ff9aa5..1518b22d6afd9d8214c5f4a0384f3344250c7704 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index f6af3366f66d23efbe930a43bb7e3a4d4528f6a9..b1e74a6e47eeb74754dca131542c11d843bf8e50 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -73,7 +73,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 7a6a402d9982180fc5dccb51043b21c7051e82ee..ac63539ab3181bde5dff4283e9f9beac0224b8dc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -73,7 +73,6 @@
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='VGA.vgamem_mb'/>