From 0a9052e03e8b750e34868b3a9eded7e08d7bf790 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 6 Aug 2021 15:23:00 +0200
Subject: [PATCH] qemu: capabilities: Retire QEMU_CAPS_BOOT_STRICT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's not used since last commit.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@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 3c04e9fb25..fbb5e618af 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -287,7 +287,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "virtio-mmio", /* QEMU_CAPS_DEVICE_VIRTIO_MMIO */
               "ich9-intel-hda", /* QEMU_CAPS_DEVICE_ICH9_INTEL_HDA */
               "kvm-pit-lost-tick-policy", /* QEMU_CAPS_KVM_PIT_TICK_POLICY */
-              "boot-strict", /* QEMU_CAPS_BOOT_STRICT */
+              "boot-strict", /* X_QEMU_CAPS_BOOT_STRICT */
               "pvpanic", /* QEMU_CAPS_DEVICE_PANIC */
 
               /* 160 */
@@ -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", "strict", QEMU_CAPS_BOOT_STRICT },
     { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
     { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT },
     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 4e8a4b6eae..338008edbb 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -266,7 +266,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */
     QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, /* -device ich9-intel-hda */
     QEMU_CAPS_KVM_PIT_TICK_POLICY, /* kvm-pit.lost_tick_policy */
-    QEMU_CAPS_BOOT_STRICT, /* -boot strict */
+    X_QEMU_CAPS_BOOT_STRICT, /* -boot strict */
     QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */
 
     /* 160 */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 32c25f9e99..cda8de1ae7 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -30,7 +30,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 631f644144..9112b5791e 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 4c7208d641..07cd494c33 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 2b6e7e7135..37f7f59774 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 05bd930e64..99c20d5395 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -30,7 +30,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index ea9ed17e09..9bf25dc17a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index ddb52837c9..e3b66d1907 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index dd3e2c161f..b06b7ae182 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -20,7 +20,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 08fc4a7b27..e3c91264cc 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -20,7 +20,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index a573d88160..9e3259ec19 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -31,7 +31,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index b3c564e0b9..a3e3e3c11d 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index f384a7b9db..5ce792638b 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 54a17f140b..00a3c968b3 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 7b2f6c2f28..57ac04bb00 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 2107136a5d..7afa937a63 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 9ec5904595..8c0fa9af0e 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -54,7 +54,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index d2d13be129..dfa2aba2b0 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -54,7 +54,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 9a5cc1fcc7..5108683bb3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -31,7 +31,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 584d2f7aea..f7d8261e49 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 27eb5531bd..aaad764dda 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 600e4a5649..86432a186a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 68318e2eaa..65c0e826d1 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 5b3467d22c..9b9455ce9b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -31,7 +31,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 193e401b20..b18fc45a54 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 826b398bd8..42dae21068 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -53,7 +53,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 0365998fc7..80c7c388e7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index fe09a6868a..421f9945c6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -54,7 +54,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index aa3e922098..d2f410bd3f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index d1ada94570..86d181a2db 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -19,7 +19,6 @@
   <flag name='rng-egd'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a40a506f5c..ea3b214b76 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index fc0fd3f5ec..6045b31e7f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -53,7 +53,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index ea5c58a8c1..a081ec2388 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index a23b432037..6efe86747f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -54,7 +54,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 0dba47beed..15d71545df 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -31,7 +31,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4973b08378..a94efa8c91 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index acf2a6bbdc..4ec6108ced 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='boot-strict'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index c704f0085c..89c8101cd6 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -31,7 +31,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
-  <flag name='boot-strict'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 5c0391af34..9dd982583b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 9446fa274f..3cd13e6f90 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>