[PATCH 08/14] 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(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - 41 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0c6c8a7e9a..175b6bd239 100644 --- 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 */ @@ -3203,7 +3203,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 70baf2810c..aa4c314e92 100644 --- 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 d4095da183..fa770b65df 100644 --- 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 57a5d1a585..93c2a6d1b6 100644 --- 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 a4e40a3116..22045eb552 100644 --- 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 cb51a3a47e..62cc85c2c1 100644 --- 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 911faae717..f1c0ee2fe6 100644 --- 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 3e4cdceed2..27d26d52d3 100644 --- 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 e72df26c8b..3dd3f2f636 100644 --- 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 95b5e0b3ab..17537f168a 100644 --- 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 4739419824..4b1c1f3bcf 100644 --- 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 e8726ceb17..17c29c3946 100644 --- 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 b0ac171609..62ca822db6 100644 --- 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 d23afeec4e..4849bb6f1e 100644 --- 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 55144844e4..f4ea032b2d 100644 --- 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 8db2344b73..4496d6302b 100644 --- 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 d9b990dbb7..1900ff1688 100644 --- 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 4d17c39aac..ba8c363266 100644 --- 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 d89fc6ada9..6fc79de762 100644 --- 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 d203a4cf86..81130ffa41 100644 --- 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 a3b25efec9..f468826bf3 100644 --- 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 e52adbe069..1309f8236a 100644 --- 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 c87d9133ac..6ab5c71abc 100644 --- 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 4520de76be..32cacd2447 100644 --- 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 7b1db31bb9..054f854933 100644 --- 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 d1fcaf5f03..34f59a1135 100644 --- 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 f7c78a43fb..86bc49aefb 100644 --- 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 cd2d74ea16..d87485f033 100644 --- 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 b58445ec45..6060e23866 100644 --- 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 b4df1ea0de..fda858eb43 100644 --- 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 12ca20d06d..4407d94de8 100644 --- 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 149c8652eb..1ec964fc12 100644 --- 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 b3db65e063..3f18c96301 100644 --- 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 655dd5742f..e5d3b2cc04 100644 --- 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 1b011c3bd6..c2c06913f7 100644 --- 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 b6298ee616..ce9ce06f4c 100644 --- 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 015bdfb939..7d570168ff 100644 --- 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 473108332d..d4ce906038 100644 --- 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 04d2e1e041..30bd32074e 100644 --- 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 6d2399965f..b079112f6d 100644 --- 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 fc90966e81..e3dabacea5 100644 --- 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'/> -- 2.31.1