|
 |
9ae3a8 |
From 9dcde11f25f85804f31d00fc45eed16595aebeec Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 18 Sep 2013 10:31:44 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 38/38] qemu-iotests: Remove lsi53c895a tests from 051
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1379499002-5231-7-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54437
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 6/6] qemu-iotests: Remove lsi53c895a tests from 051
|
|
|
9ae3a8 |
Bugzilla: 1006959
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
BZ: 1006959
|
|
|
9ae3a8 |
Upstream: N/A, RHEL-only
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
LSI SCSI is disabled in RHEL7, the corresponding checks in 051 are
|
|
|
9ae3a8 |
therefore bound to fail. This patch removes these checks and their
|
|
|
9ae3a8 |
expected output from test 051.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/qemu-iotests/051 | 20 +++++++++---------
|
|
|
9ae3a8 |
tests/qemu-iotests/051.out | 47 --------------------------------------------
|
|
|
9ae3a8 |
2 files changed, 10 insertions(+), 57 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
|
9ae3a8 |
index 1f39c6a..93a2797 100755
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/051
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/051
|
|
|
9ae3a8 |
@@ -94,19 +94,19 @@ echo
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive if=floppy
|
|
|
9ae3a8 |
run_qemu -drive if=ide,media=cdrom
|
|
|
9ae3a8 |
-run_qemu -drive if=scsi,media=cdrom
|
|
|
9ae3a8 |
+#run_qemu -drive if=scsi,media=cdrom
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive if=ide
|
|
|
9ae3a8 |
run_qemu -drive if=virtio
|
|
|
9ae3a8 |
-run_qemu -drive if=scsi
|
|
|
9ae3a8 |
+#run_qemu -drive if=scsi
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive if=none,id=disk -device ide-cd,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive if=none,id=disk -device ide-drive,drive=disk
|
|
|
9ae3a8 |
run_qemu -drive if=none,id=disk -device ide-hd,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
echo
|
|
|
9ae3a8 |
echo === Read-only ===
|
|
|
9ae3a8 |
@@ -114,19 +114,19 @@ echo
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=floppy,readonly=on
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=ide,media=cdrom,readonly=on
|
|
|
9ae3a8 |
-run_qemu -drive file=$TEST_IMG,if=scsi,media=cdrom,readonly=on
|
|
|
9ae3a8 |
+#run_qemu -drive file=$TEST_IMG,if=scsi,media=cdrom,readonly=on
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=ide,readonly=on
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=virtio,readonly=on
|
|
|
9ae3a8 |
-run_qemu -drive file=$TEST_IMG,if=scsi,readonly=on
|
|
|
9ae3a8 |
+#run_qemu -drive file=$TEST_IMG,if=scsi,readonly=on
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
|
9ae3a8 |
run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device ide-hd,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
-run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
+#run_qemu -drive file=$TEST_IMG,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
echo
|
|
|
9ae3a8 |
echo === Cache modes ===
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
index 5582ed3..e3cf244 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
@@ -65,10 +65,6 @@ Testing: -drive if=ide,media=cdrom
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive if=scsi,media=cdrom
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive if=ide
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) QEMU_PROG: Device needs media, but drive is empty
|
|
|
9ae3a8 |
@@ -82,21 +78,10 @@ QEMU_PROG: -drive if=virtio: Device initialization failed.
|
|
|
9ae3a8 |
QEMU_PROG: -drive if=virtio: Device initialization failed.
|
|
|
9ae3a8 |
QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive if=scsi
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
|
|
|
9ae3a8 |
-QEMU_PROG: -drive if=scsi: Device initialization failed.
|
|
|
9ae3a8 |
-QEMU_PROG: Device initialization failed.
|
|
|
9ae3a8 |
-QEMU_PROG: Initialization of device lsi53c895a failed
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive if=none,id=disk -device ide-cd,drive=disk
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive if=none,id=disk -device ide-drive,drive=disk
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty
|
|
|
9ae3a8 |
@@ -109,18 +94,6 @@ QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed.
|
|
|
9ae3a8 |
QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) QEMU_PROG: -device scsi-disk,drive=disk: Device needs media, but drive is empty
|
|
|
9ae3a8 |
-QEMU_PROG: -device scsi-disk,drive=disk: Device initialization failed.
|
|
|
9ae3a8 |
-QEMU_PROG: -device scsi-disk,drive=disk: Device 'scsi-disk' could not be initialized
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
-Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) QEMU_PROG: -device scsi-hd,drive=disk: Device needs media, but drive is empty
|
|
|
9ae3a8 |
-QEMU_PROG: -device scsi-hd,drive=disk: Device initialization failed.
|
|
|
9ae3a8 |
-QEMU_PROG: -device scsi-hd,drive=disk: Device 'scsi-hd' could not be initialized
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
=== Read-only ===
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -132,10 +105,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
|
|
|
9ae3a8 |
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: read-only not supported by this bus type
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -143,18 +112,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
|
9ae3a8 |
QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) QEMU_PROG: -device ide-drive,drive=disk: Can't use a read-only drive
|
|
|
9ae3a8 |
@@ -167,14 +128,6 @@ QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed.
|
|
|
9ae3a8 |
QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
-Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9ae3a8 |
-QEMU X.Y.Z monitor - type 'help' for more information
|
|
|
9ae3a8 |
-(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
=== Cache modes ===
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|