5435e8a804
Backport patches related with iotest from upstream * Patches added: block-backend-Retain-permissions-after-m.patch iotest-065-explicit-compression-type.patch iotest-214-explicit-compression-type.patch iotest-302-use-img_info_log-helper.patch iotest-303-explicit-compression-type.patch iotest-39-use-_qcow2_dump_header.patch iotests-60-more-accurate-set-dirty-bit-i.patch iotests-bash-tests-filter-compression-ty.patch iotests-common.rc-introduce-_qcow2_dump_.patch iotests-declare-lack-of-support-for-comp.patch iotests-drop-qemu_img_verbose-helper.patch iotests-massive-use-_qcow2_dump_header.patch iotests-MRCE-Write-data-to-source.patch iotests.py-filter-out-successful-output-.patch iotests.py-img_info_log-rename-imgopts-a.patch iotests.py-implement-unsupported_imgopts.patch iotests.py-qemu_img-create-support-IMGOP.patch iotests.py-rewrite-default-luks-support-.patch iotests-specify-some-unsupported_imgopts.patch qcow2-simple-case-support-for-downgradin.patch tests-qemu-iotests-Fix-051-for-binaries-.patch OBS-URL: https://build.opensuse.org/request/show/955876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=690
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Mon, 6 Dec 2021 15:34:04 +0100
|
|
Subject: tests/qemu-iotests: Fix 051 for binaries without 'lsi53c895a'
|
|
|
|
Git-commit: 0c83471bd75d329f4945e27dc1aa3a6cc2fda3bf
|
|
|
|
The lsi53c895a SCSI adaptor might not be enabled in each and every
|
|
x86 QEMU binary, e.g. it's disabled in the RHEL/CentOS build.
|
|
Thus let's add a check to the 051 test so that it does not fail if
|
|
this device is not available.
|
|
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
Message-Id: <20211206143404.247032-1-thuth@redhat.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/051 | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
index 1d2fa93a11593ffa70cecf106532..e9042a621420332ac288060cbec2 100755
|
|
--- a/tests/qemu-iotests/051
|
|
+++ b/tests/qemu-iotests/051
|
|
@@ -45,6 +45,10 @@ _supported_proto file
|
|
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
|
|
_require_drivers nbd
|
|
|
|
+if [ "$QEMU_DEFAULT_MACHINE" = "pc" ]; then
|
|
+ _require_devices lsi53c895a
|
|
+fi
|
|
+
|
|
do_run_qemu()
|
|
{
|
|
echo Testing: "$@"
|