Patchwork qemu-iotests: Remove duplicated error message line in 051.out

login
register
mail settings
Submitter Fam Zheng
Date Jan. 6, 2014, 1:49 a.m.
Message ID <1388972947-10423-1-git-send-email-famz@redhat.com>
Download mbox | patch
Permalink /patch/307077/
State New
Headers show

Comments

Fam Zheng - Jan. 6, 2014, 1:49 a.m.
Since 75884af (virtio-blk: Convert to QOM realize), the duplication of
error message is gone. Fix the test reference output to match this.

Reported-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/051.out | 1 -
 1 file changed, 1 deletion(-)
Stefan Hajnoczi - Jan. 6, 2014, 6:16 a.m.
On Mon, Jan 06, 2014 at 09:49:07AM +0800, Fam Zheng wrote:
> Since 75884af (virtio-blk: Convert to QOM realize), the duplication of
> error message is gone. Fix the test reference output to match this.
> 
> Reported-by: Peter Lieven <pl@kamp.de>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/051.out | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
> index 49e95a2..c2cadba 100644
> --- a/tests/qemu-iotests/051.out
> +++ b/tests/qemu-iotests/051.out
> @@ -91,7 +91,6 @@ Testing: -drive if=virtio
>  QEMU X.Y.Z monitor - type 'help' for more information
>  (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
>  QEMU_PROG: -drive if=virtio: Device initialization failed.
> -QEMU_PROG: -drive if=virtio: Device initialization failed.
>  QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
>  
>  Testing: -drive if=scsi

Duplicate.  Please see commit db2f695f1bf68eec38f2d7cc26ba3846c97a3f54
("qemu-iotests: drop duplicate virtio-blk initialization failure") which
will be merged into qemu.git/master when Anthony merges the pending
block pull request.

Stefan

Patch

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 49e95a2..c2cadba 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -91,7 +91,6 @@  Testing: -drive if=virtio
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
 QEMU_PROG: -drive if=virtio: Device initialization failed.
-QEMU_PROG: -drive if=virtio: Device initialization failed.
 QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
 
 Testing: -drive if=scsi