[PATCH 05/14] qemu: capabilities: Retire QEMU_CAPS_REBOOT_TIMEOUT

Peter Krempa pkrempa at redhat.com
Mon Sep 20 15:29:27 UTC 2021 

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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 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 b67dd07fe1..0c6c8a7e9a 100644
--- 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 */
@@ -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", "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 103ae7db01..70baf2810c 100644
--- 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 cda8de1ae7..d4095da183 100644
--- 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 9112b5791e..57a5d1a585 100644
--- 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 37978623ad..a4e40a3116 100644
--- 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 0bdcec004d..cb51a3a47e 100644
--- 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 4b14e38178..911faae717 100644
--- 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 eba960cb4c..3e4cdceed2 100644
--- 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 dabedc22cc..e72df26c8b 100644
--- 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 b06b7ae182..95b5e0b3ab 100644
--- 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 e3c91264cc..4739419824 100644
--- 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 acd3385ed2..e8726ceb17 100644
--- 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 583878656a..b0ac171609 100644
--- 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 d4097dba91..d23afeec4e 100644
--- 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 329dba9fb6..55144844e4 100644
--- 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 94973ec19f..8db2344b73 100644
--- 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 4e96048a91..d9b990dbb7 100644
--- 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 f4d5be1c0e..4d17c39aac 100644
--- 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 91a0091a99..d89fc6ada9 100644
--- 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 40ef49b22e..d203a4cf86 100644
--- 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 32b80edf43..a3b25efec9 100644
--- 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 b70833b82e..e52adbe069 100644
--- 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 601e943d30..c87d9133ac 100644
--- 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 1317194eac..4520de76be 100644
--- 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 3170247547..7b1db31bb9 100644
--- 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 95d4bc249f..d1fcaf5f03 100644
--- 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 ce5f1e6285..f7c78a43fb 100644
--- 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 28d9e6c4ab..cd2d74ea16 100644
--- 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 95f9880292..b58445ec45 100644
--- 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 c80898b480..b4df1ea0de 100644
--- 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 86d181a2db..12ca20d06d 100644
--- 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 b931902c09..149c8652eb 100644
--- 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 54298c2230..b3db65e063 100644
--- 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 6edcc5d127..655dd5742f 100644
--- 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 cdcbca479f..1b011c3bd6 100644
--- 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 a6a9fbf341..b6298ee616 100644
--- 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 d0aa557430..015bdfb939 100644
--- 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 aa479b5039..473108332d 100644
--- 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 c9e5914bd4..04d2e1e041 100644
--- 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 debe252789..6d2399965f 100644
--- 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 35951ac108..fc90966e81 100644
--- 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'/>
-- 
2.31.1

More information about the libvir-list mailing list