|
 |
218e99 |
From b63711901e9e01f780e0b4be99bac6009e795b68 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Wed, 10 Jul 2013 17:30:26 +0200
|
|
|
218e99 |
Subject: [PATCH 29/38] qemu-iotests: Update 051 reference output
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1378736903-18489-30-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54216
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 29/32] qemu-iotests: Update 051 reference output
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
|
|
|
218e99 |
This has been broken by commit bd5c51ee.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit 7a370406bdd13b1d46230d1cbca308d984d0dcae)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
tests/qemu-iotests/051.out | 107 ++++++++++++++++++++++++++-----------
|
|
|
218e99 |
tests/qemu-iotests/common.filter | 2 +-
|
|
|
218e99 |
2 files changed, 76 insertions(+), 33 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
|
|
|
218e99 |
index 6b3d636..95ff245 100644
|
|
|
218e99 |
--- a/tests/qemu-iotests/051.out
|
|
|
218e99 |
+++ b/tests/qemu-iotests/051.out
|
|
|
218e99 |
@@ -23,10 +23,12 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo: could not
|
|
|
218e99 |
=== Enable and disable lazy refcounting on the command line, plus some invalid values ===
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=off
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=
|
|
|
218e99 |
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=: Parameter 'lazy_refcounts' expects 'on' or 'off'
|
|
|
218e99 |
@@ -49,112 +51,152 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on: Lazy ref
|
|
|
218e99 |
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on: could not open disk image TEST_DIR/t.qcow2: Invalid argument
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=off
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
|
|
|
218e99 |
=== No medium ===
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=floppy
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=ide,media=cdrom
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=scsi,media=cdrom
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=ide
|
|
|
218e99 |
-QEMU_PROG: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: Initialization of device ide-hd failed
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=virtio
|
|
|
218e99 |
-QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -drive if=virtio: Device initialization failed.
|
|
|
218e99 |
+QEMU_PROG: -drive if=virtio: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=scsi
|
|
|
218e99 |
-QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -drive if=scsi: Device initialization failed.
|
|
|
218e99 |
+QEMU_PROG: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: Initialization of device lsi53c895a failed
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device ide-cd,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device ide-drive,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -device ide-drive,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device ide-drive,drive=disk: Device 'ide-drive' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device ide-hd,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device ide-hd,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device ide-hd,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device scsi-disk,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device scsi-disk,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -device scsi-disk,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device scsi-disk,drive=disk: Device 'scsi-disk' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device scsi-hd,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device scsi-hd,drive=disk: Device needs media, but drive is empty
|
|
|
218e99 |
+QEMU_PROG: -device scsi-hd,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device scsi-hd,drive=disk: Device 'scsi-hd' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
|
|
|
218e99 |
=== Read-only ===
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=floppy,readonly=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
|
|
|
218e99 |
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: readonly not supported by this bus type
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device ide-drive,drive=disk: Can't use a read-only drive
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device ide-drive,drive=disk: Can't use a read-only drive
|
|
|
218e99 |
+QEMU_PROG: -device ide-drive,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device ide-drive,drive=disk: Device 'ide-drive' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-hd,drive=disk
|
|
|
218e99 |
-QEMU_PROG: -device ide-hd,drive=disk: Can't use a read-only drive
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) QEMU_PROG: -device ide-hd,drive=disk: Can't use a read-only drive
|
|
|
218e99 |
+QEMU_PROG: -device ide-hd,drive=disk: Device initialization failed.
|
|
|
218e99 |
QEMU_PROG: -device ide-hd,drive=disk: Device 'ide-hd' could not be initialized
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
|
|
|
218e99 |
=== Cache modes ===
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=none
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=directsync
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=writeback
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=writethrough
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=unsafe
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive media=cdrom,cache=invalid_value
|
|
|
218e99 |
QEMU_PROG: -drive media=cdrom,cache=invalid_value: invalid cache option
|
|
|
218e99 |
@@ -163,7 +205,8 @@ QEMU_PROG: -drive media=cdrom,cache=invalid_value: invalid cache option
|
|
|
218e99 |
=== Specifying the protocol layer ===
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,file.driver=file
|
|
|
218e99 |
-q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
+QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
218e99 |
+(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
218e99 |
|
|
|
218e99 |
Testing: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2
|
|
|
218e99 |
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: Can't use 'qcow2' as a block driver for the protocol level
|
|
|
218e99 |
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
|
|
|
218e99 |
index dcf6391..9dbcae8 100644
|
|
|
218e99 |
--- a/tests/qemu-iotests/common.filter
|
|
|
218e99 |
+++ b/tests/qemu-iotests/common.filter
|
|
|
218e99 |
@@ -155,7 +155,7 @@ _filter_qemu_io()
|
|
|
218e99 |
# replace occurrences of QEMU_PROG with "qemu"
|
|
|
218e99 |
_filter_qemu()
|
|
|
218e99 |
{
|
|
|
218e99 |
- sed -e "s#^$(basename $QEMU_PROG):#QEMU_PROG:#"
|
|
|
218e99 |
+ sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#"
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
# make sure this script returns success
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|