[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/4] qemu: parse and format os.bootStrict from/to command line



Recent commit 96fddee3 ('qemu: add "-boot strict" to commandline whenever
possible') breaks qemu boot order processing in OVMF. The qemu option
'-boot strict=on' closes down the fw_cfg boot option list with a HALT
string:

  /pci i0cf8/ethernet 3/ethernet-phy 0
  /pci i0cf8/scsi 4/disk 0,0
  HALT

The fw_cfg boot order specification that is traditional between QEMU and
SeaBIOS is not descriptive / expressive enough for perfect matching
against UEFI device paths. First, a UEFI boot option (device path)
includes the file path leading to the specific boot loader application;
OFW device paths include no file paths. Second, UEFI device paths can
include nodes that may have no OFW representation (eg. Vendor (GUID)
hardware device path nodes, or nodes describing memory mapped code).

When a preexistent UEFI boot option is *not* identified (matched) by any
fw_cfg OpenFirmware boot entry after translating the latter, then '-boot
strict=on' is ambiguous:

- If the user has left out the boot option because he/she wants to omit it
  indeed, then *ignoring* the trailing HALT line (ie. '-boot strict=on')
  would be wrong.

- If the user has left out the boot option because it cannot be expressed
  as an OpenFirmware boot entry (for example, the memory mapped UEFI
  shell), then *obeying* the trailing HALT line (ie. '-boot strict=on')
  would be wrong.

("Halting" would be inappropriate anyway in UEFI firmware; the user could
be returned to the OVMF configration TUI at best.)

Currently OVMF rejects the entire boot order specification when it
encounters HALT (which is the clear and sensible choice in face of the
above ambiguity). Unfortunately, commit 96fddee3 breaks this (and would
also break the other two) approach(es), by hard-wiring the HALT entry.
Therefore OVMF users need a way to disable '-boot strict=on'.

For more details on OVMF behavior, please see the related RHBZ,
<https://bugzilla.redhat.com/show_bug.cgi?id=1056258>.

Regarding the implementation, it certainly complicates things that the
libvirt default introduced by commit 96fddee3 -- "request strict boot",
which we'd like to stick with -- is the opposite of qemu's default ("no
strict boot"). As a result, it's not possible to decide in
qemuParseCommandLine() uniquely whether '-boot strict=on' should be mapped
to "default" or "enabled". The explicit "enabled" value seems safer.

Signed-off-by: Laszlo Ersek <lersek redhat com>
---
 src/qemu/qemu_command.c                            | 17 +++++-
 tests/qemuxml2argvtest.c                           |  4 ++
 tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml |  1 +
 .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml  |  1 +
 .../qemuxml2argvdata/qemuxml2argv-boot-network.xml |  1 +
 .../qemuxml2argv-boot-strict-off.args              | 36 ++++++++++++
 .../qemuxml2argv-boot-strict-off.xml               | 67 ++++++++++++++++++++++
 .../qemuxml2argv-clock-localtime.xml               |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml  |  1 +
 .../qemuxml2argv-console-compat.xml                |  1 +
 .../qemuxml2argv-disk-cdrom-empty.xml              |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml |  1 +
 .../qemuxml2argv-disk-drive-boot-cdrom.xml         |  1 +
 .../qemuxml2argv-disk-drive-boot-disk.xml          |  1 +
 .../qemuxml2argv-disk-drive-cache-directsync.xml   |  1 +
 .../qemuxml2argv-disk-drive-cache-unsafe.xml       |  1 +
 .../qemuxml2argv-disk-drive-cache-v1-none.xml      |  1 +
 .../qemuxml2argv-disk-drive-cache-v1-wb.xml        |  1 +
 .../qemuxml2argv-disk-drive-cache-v2-none.xml      |  1 +
 .../qemuxml2argv-disk-drive-cache-v2-wb.xml        |  1 +
 .../qemuxml2argv-disk-drive-cache-v2-wt.xml        |  1 +
 ...muxml2argv-disk-drive-error-policy-enospace.xml |  1 +
 .../qemuxml2argv-disk-drive-error-policy-stop.xml  |  1 +
 ...rgv-disk-drive-error-policy-wreport-rignore.xml |  1 +
 .../qemuxml2argv-disk-drive-fmt-qcow.xml           |  1 +
 .../qemuxml2argv-disk-drive-network-gluster.xml    |  1 +
 .../qemuxml2argv-disk-drive-network-iscsi.xml      |  1 +
 .../qemuxml2argv-disk-drive-network-nbd-export.xml |  1 +
 ...xml2argv-disk-drive-network-nbd-ipv6-export.xml |  1 +
 .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml   |  1 +
 .../qemuxml2argv-disk-drive-network-nbd-unix.xml   |  1 +
 .../qemuxml2argv-disk-drive-network-nbd.xml        |  1 +
 ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml |  1 +
 .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml   |  1 +
 .../qemuxml2argv-disk-drive-network-rbd.xml        |  1 +
 .../qemuxml2argv-disk-drive-network-sheepdog.xml   |  1 +
 .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml  |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml  |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml   |  1 +
 .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml  |  1 +
 .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml  |  1 +
 .../qemuxml2argv-graphics-sdl-fullscreen.xml       |  1 +
 .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml |  1 +
 .../qemuxml2argv-graphics-vnc-policy.xml           |  1 +
 .../qemuxml2argv-graphics-vnc-sasl.xml             |  1 +
 .../qemuxml2argv-graphics-vnc-socket.xml           |  1 +
 .../qemuxml2argv-graphics-vnc-tls.xml              |  1 +
 .../qemuxml2argv-graphics-vnc-websocket.xml        |  1 +
 .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml |  1 +
 .../qemuxml2argv-hostdev-pci-address.xml           |  1 +
 .../qemuxml2argv-hostdev-usb-address.xml           |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml     |  1 +
 .../qemuxml2argv-input-usbmouse.xml                |  1 +
 .../qemuxml2argv-input-usbtablet.xml               |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml   |  1 +
 .../qemuxml2argv-machine-core-off.xml              |  1 +
 .../qemuxml2argv-machine-core-on.xml               |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-migrate.xml    |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml  |  1 +
 .../qemuxml2argv-misc-disable-s3.xml               |  1 +
 .../qemuxml2argv-misc-disable-suspends.xml         |  1 +
 .../qemuxml2argv-misc-enable-s4.xml                |  1 +
 .../qemuxml2argv-misc-no-reboot.xml                |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml  |  1 +
 .../qemuxml2argv-net-eth-ifname.xml                |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml    |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-net-user.xml   |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml |  1 +
 .../qemuxml2argv-nographics-vga.xml                |  1 +
 .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml |  1 +
 .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml |  1 +
 .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml |  1 +
 .../qemuxml2argv-pseries-nvram.xml                 |  1 +
 .../qemuxml2argv-qemu-ns-no-env.xml                |  1 +
 .../qemuxml2argv-reboot-timeout-disabled.xml       |  1 +
 .../qemuxml2argv-reboot-timeout-enabled.xml        |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml |  1 +
 .../qemuxml2argvdata/qemuxml2argv-serial-file.xml  |  1 +
 .../qemuxml2argvdata/qemuxml2argv-serial-many.xml  |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml |  1 +
 .../qemuxml2argv-serial-tcp-telnet.xml             |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml |  1 +
 .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml  |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml  |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-smp.xml        |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-sound.xml      |  1 +
 tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml   |  1 +
 90 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 96b8825..c1b5269 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8242,7 +8242,18 @@ qemuBuildCommandLine(virConnectPtr conn,
         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT)) {
             if (boot_nparams++)
                 virBufferAddChar(&boot_buf, ',');
-            virBufferAddLit(&boot_buf, "strict=on");
+
+            if (def->os.bootStrict == VIR_DOMAIN_BOOT_STRICT_DISABLED)
+                virBufferAddLit(&boot_buf, "strict=off");
+            else
+                virBufferAddLit(&boot_buf, "strict=on");
+        } else if (def->os.bootStrict == VIR_DOMAIN_BOOT_STRICT_ENABLED) {
+            /* When QEMU doesn't support -boot strict, then the libvirt default
+             * ("enable strict boot") won't work. But we didn't complain in
+             * that situation before, so let's start complaining only when the
+             * user explicitly requests strict boot and we can't provide it. */
+            VIR_WARN("strict boot is requested but not "
+                     "supported by this QEMU binary");
         }
 
         if (boot_nparams > 0) {
@@ -11228,6 +11239,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
         (def->os.arch == VIR_ARCH_X86_64))
         def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_DOMAIN_FEATURE_STATE_ON;
 
+    def->os.bootStrict = VIR_DOMAIN_BOOT_STRICT_DISABLED;
+
 #define WANT_VALUE()                                                   \
     const char *val = progargv[++i];                                   \
     if (!val) {                                                        \
@@ -11573,6 +11586,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
                         qemuParseCommandLineBootDevs(def, token);
                     } else if (STRPREFIX(token, "menu=on")) {
                         def->os.bootmenu = 1;
+                    } else if (STRPREFIX(token, "strict=on")) {
+                        def->os.bootStrict = VIR_DOMAIN_BOOT_STRICT_ENABLED;
                     } else if (STRPREFIX(token, "reboot-timeout=")) {
                         int num;
                         char *endptr;
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a25264e..6a8e054 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -609,6 +609,10 @@ mymain(void)
             QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT,
             QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
+    DO_TEST("boot-strict-off",
+            QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
+            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT,
+            QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
     DO_TEST("bootloader", QEMU_CAPS_DOMID, QEMU_CAPS_KVM);
 
     DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT);
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
index b5c37bb..d7798c6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
index e42f7ed..3daedc5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='fd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
index 8124f34..0a176de 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='network'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.args
new file mode 100644
index 0000000..d51b3c7
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.args
@@ -0,0 +1,36 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
+/usr/bin/qemu \
+-S \
+-M pc \
+-m 214 \
+-smp 1 \
+-nographic \
+-nodefaults \
+-monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi \
+-boot strict=off \
+-usb \
+-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
+id=virtio-disk0,bootindex=3 \
+-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
+id=virtio-disk1 \
+-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
+-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \
+-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \
+-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\
+bootindex=1 \
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
+-global isa-fdc.driveA=drive-fdc0-0-0 \
+-global isa-fdc.bootindexA=4 \
+-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \
+-global isa-fdc.driveB=drive-fdc0-0-1 \
+-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,\
+addr=0x3,bootindex=2 \
+-net user,vlan=0,name=hostnet0 \
+-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\
+addr=0x4 \
+-net user,vlan=1,name=hostnet1
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.xml
new file mode 100644
index 0000000..d4d595e
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict-off.xml
@@ -0,0 +1,67 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+    <boot dev='network'/>
+    <boot dev='hd'/>
+    <boot dev='fd'/>
+    <boot-strict enable='no'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <disk type='file' device='disk'>
+      <source file='/tmp/vdb.img'/>
+      <target dev='vdb' bus='virtio'/>
+    </disk>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/hdb'/>
+      <target dev='hdb' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/hda'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/vda.img'/>
+      <target dev='vda' bus='virtio'/>
+    </disk>
+    <disk type='block' device='cdrom'>
+      <source dev='/dev/HostVG/hdc'/>
+      <target dev='hdc' bus='ide'/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <disk type='block' device='floppy'>
+      <source dev='/dev/fd1'/>
+      <target dev='fdb' bus='fdc'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='block' device='floppy'>
+      <source dev='/dev/fd0'/>
+      <target dev='fda' bus='fdc'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='fdc' index='0'/>
+    <controller type='ide' index='0'/>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:11'/>
+      <model type='virtio'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:22'/>
+      <model type='virtio'/>
+    </interface>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
index 2acb71f..c4e3422 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='localtime'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
index 138a83a..1c04788 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
index b1ee29c..742a039 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
index d8ff676..3f2a655 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
index 75b9cec..6105092 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
index 59ef29d..54e037b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
index 0c9bc08..725c726 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
index 0b85fb1..b1b4dc5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
index 4bd8e24..48de211 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
index 7fe9082..9550672 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
index f0e7df4..2ae56db 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
index 0beda48..e85699c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
index 00730f7..6a10267 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
index 6ee75aa..6599262 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
index 92fcd8a..044762f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
index 83d5dd0..c2b19c1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
index ded9cd1..b2c5825 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
index 85fe2a9..468dd11 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
index 7c1fdb1..bb76ca1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
index a6b13ab..39f8efb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
index dd52c39..98c2ce8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
index c3bfa34..891da94 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
index 8087f90..04240dc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
index 0955fee..89522c0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
index e74b95f..0901a71 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
index bba512e..fb4b271 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
index 06e852d..eb73aa2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
index bba512e..fb4b271 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
index d20ca3e..3479833 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
index 8bbd324..e4cd9b9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
index edcd015..2b61289 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
index 730c4f3..7632003 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
index 3e2e550..5902eb1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
index 3baf97d..b822704 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
index 7793161..12bbfd8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
index 26fe28b..eaf4ecb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
index 6c95c8a..dd5dbe5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
index 75563df..0bf5020 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
index 24c7eed..c855602 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
index 75563df..0bf5020 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
index dd0bb57..84402d8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
index 6dcd076..144ec8a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
index 422127c..13fcbd9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
index ee00634..9ff4f9b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
index bb36fc0..f74e2e7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='network'/>
+    <boot-strict enable='no'/>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
index 0863737..931b11e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
index 03558dd..0a815ea 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
index a187aaa..a0c3ecf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='network'/>
+    <boot-strict enable='no'/>
   </os>
   <features>
     <pae/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
index 5eb229f..7f1625b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
index 0dd5b39..1a14a62 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
index 3a375fe..6404810 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
index 6fe8a85..347daa8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
index b9313e0..e9e3f67 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
index f432732..fdef5c0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
index cea52f8..76646f6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
index 10c2d41..3681f4a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
index 6fe8a85..347daa8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <features>
     <acpi/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
index 8ad6eb7..3b1d975 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
index 6f00fe1..f1f7c9d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
index 960b7aa..d1c6920 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
index 195a3d9..5672d81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
index 3a375fe..6404810 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
index 5e54cd0..6e0383f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
@@ -10,6 +10,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
index 60ea846..04ba9ed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
index dbbd6aa..f6d8fae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
index d001ee7..4a78f70 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
index 29f84db..42bc3cb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
index 883a804..54aa10f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='network'/>
+    <boot-strict enable='no'/>
     <bios rebootTimeout='-1'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
index a298b9d..ecd223a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='network'/>
+    <boot-strict enable='no'/>
     <bios rebootTimeout='128'/>
   </os>
   <clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
index 138a83a..1c04788 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
index 3a375fe..6404810 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
index b1a7429..0fcfef3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
index 4335f43..4fd4d63 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
index 4829285..5150cda 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
index d2af760..ced9458 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
index 06ce154..919cb7c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
index 493f8a1..855347a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
index d525965..3be5227 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
index 8aa052d..0b8f501 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
index 12107d7..4e64e1c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
index 55bf16d..2a6b3c3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <cpu>
     <topology sockets='2' cores='1' threads='1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
index 0bd1185..5130a34 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
index 32d57e0..2297005 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
@@ -7,6 +7,7 @@
   <os>
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
+    <boot-strict enable='no'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
-- 
1.8.3.1



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]