qemu: capabilities: Retire QEMU_CAPS_REBOOT_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 fbb5e618af0ad75c6403411e74ad16031a514f07..8f4f2d7de5c204ae9ef61ae695ea0fd036f3359a 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -217,7 +217,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "ide-drive.wwn", /* QEMU_CAPS_IDE_DRIVE_WWN */
               "scsi-disk.wwn", /* QEMU_CAPS_SCSI_DISK_WWN */
               "seccomp-sandbox", /* QEMU_CAPS_SECCOMP_SANDBOX */
-              "reboot-timeout", /* QEMU_CAPS_REBOOT_TIMEOUT */
+              "reboot-timeout", /* X_QEMU_CAPS_REBOOT_TIMEOUT */
               "dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE */
 
               /* 110 */
@@ -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", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
     { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT },
     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
     { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 338008edbb82c4473da176e2da16654de35e5b9b..e6123127516535fbedaf1b84decde811e462378b 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -196,7 +196,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
     QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
     QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
-    QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
+    X_QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
     X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */
 
     /* 110 */

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index cda8de1ae7de9aa90c1151b8704be7e9cfdca7cc..d4095da18304eefb038e63416af61da6c0138907 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -17,7 +17,6 @@
   <flag name='blockio'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 9112b5791e600d82c06c5ef3adb9cc899bf8357e..57a5d1a585027988abe1ef58965ed8e605d78190 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 07cd494c33ba27c6e5f1dbabc125d84746feb27e..d50aa8651d818e7c19f39052d936fc87fd6349f3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='usb-serial'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 37f7f59774f7a08830e8b11fc8ffab0f2a981703..2e161ea1b0e84ff2821f48bc0f0ebfe93bfcb0aa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='usb-serial'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 99c20d5395282d62c60b010323d43a442a78455a..8cc5875b7426c4da69d260021953d6570d1ac12b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -17,7 +17,6 @@
   <flag name='blockio'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 9bf25dc17a1fe0d467749505f006c61a58707361..9d0f7e43fd4a8bbeab435cb2165bbdf95725546c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index e3b66d1907c61a8e093791511cf834f8b4110953..25deb650519cade783be515a031bb467cacd8da1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='usb-serial'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index b06b7ae18220dc8361f09eb44a7b7bbf99ff534a..95b5e0b3ab9542d5a59409e42f35757951c252e4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-scsi-pci'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index e3c91264cc936939ef3c1fd500d0fc96f4740e56..4739419824664eaa4fd9ad5c18cc3686f0ac41e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-scsi-pci'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 9e3259ec19930b84446d01352927a7c9a1f2e228..17e322de1f5e3dffad8d3264f3e0f63c521002a9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index a3e3e3c11d8ffb6d75b9326c6e682f1078c09870..b62f2723ce8a96f816a92d1684924d214316b291 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 5ce792638bc69d8049a41eb0fbfffab152758eb9..b2dd89696103d0cc165b082c4bd087589fc6e255 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 00a3c968b3bd3375a35edcbfe04e5f8f6ee70e0f..9d2e4f4bceab8b752c388ae7a52355ff52aff796 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 57ac04bb008afaa1a5ef1c0280fe0007a2618cbe..6b6f83e34777942cb05ad2eff0d3a51716f97bec 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 7afa937a6361c3daa081cf0b8383e3c8059caa80..06a948e817de36adadad6c629f982420cc12b3e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 8c0fa9af0e134008e8b42f16b8ac07308889f431..a7e7c344be376fa1ad25e6065b7974cedd120d95 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -34,7 +34,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index dfa2aba2b03fc0594479825d1356de3f571b970e..9f5b2eacd14975892793d69ef9fb7caefd350fac 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -34,7 +34,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 5108683bb343df09055b7edad137f26b7985aca9..534951e396564ae1f92d8794727fc40086ed6d6a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index f7d8261e494c060b533988465e9d1310ced5032b..49a7f0d20c4dd3676cdafaf269115c352adbaa65 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index aaad764dda23acef48e0845221d558e5d7afe1f3..304d878449e9fac21013e64b5280eb699048a01c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 86432a186a4ebf0431ca04a044b9676e7f3ea524..dc70e7e56982803f9f2f5178a9d1f4a62feca5d4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 65c0e826d139c225732f5534d797aadf6ddd211f..39667632c0d8a8a9c0eba4e3bf322dd7c22be283 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 9b9455ce9b5179455317f62146619ce62f7de076..34ffd3f79d17c0366c6d0919def810427cf57a9b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index b18fc45a5490fefd85a01f89885ef0f6ceee5b28..91d358c083fee3f1101ee6e32ef45e7bff2b467a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 42dae2106838d9553766df7adc4890fff7f82386..71c0fbb5c37d01a01c45422bd2aae85d6f929d2c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 80c7c388e7c97303da572635763dfd4f0b7820e4..f8175afea336d31acf15884e5411f428949a0a34 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 421f9945c61a11d32e4fc1405a48b44c06c2787c..e665171f7c8f58cc899df6095a108a15c0e8f56b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -34,7 +34,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index d2f410bd3f6263021c33c999f6766a9327edc15f..4c92c3cfa407f53828ade50d7eef939d012b1a02 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 86d181a2db3dfd03af8e7dba4c7a198eb54768eb..12ca20d06d2ea11866eecde8e264106eb058d263 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -12,7 +12,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='nbd-server'/>
   <flag name='rng-random'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index ea3b214b76d7f8d2e3d94633268fbc83b401b1f0..833711b6ad0d9d725bfbfcde4fe09835c0fd6e77 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 6045b31e7f6ab497d66535b88759bdfd3473adf5..87ae4512896bdb6e18f6fe4e3f8c527b2390bd8d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -31,7 +31,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index a081ec238888ee187d88dcd01eace0b3e06403f6..a9201f10b249b9201c8dfbb630d047d1b9785e5e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 6efe86747f83a1bc56224607aee9cc768f5946c2..1b33b672c313f1a4e8a7f5bbafbb846bda366b65 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -34,7 +34,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 15d71545df97028b39bc87510f519781c46f7a71..923a9adc49b45663d88d68cae7f897c660ea5369 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index a94efa8c9145fbba65c4be914fa8ebcf2787cc7a..76273c8f2b1ba951b2ed751e0c625a5e03540a32 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -39,7 +39,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4ec6108ced36c69634e15ce3f7d83beea4c24b83..f9c1514c8f6a819cd3f3f263a584d3e88f4f358b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -30,7 +30,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 89c8101cd6b223453b6ef86082b1b719d654f670..2b9c8fc714b7d8b9854e4ebbc916893b35ff9aa5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 9dd982583bb44b9ab28d1318fbd47ee039c1b9b0..f6af3366f66d23efbe930a43bb7e3a4d4528f6a9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -38,7 +38,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 3cd13e6f90c773992993df03db6225e61d098de0..7a6a402d9982180fc5dccb51043b21c7051e82ee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -38,7 +38,6 @@
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
-  <flag name='reboot-timeout'/>
   <flag name='vnc'/>
   <flag name='qxl'/>
   <flag name='VGA'/>