From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51767)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1W03UD-0000Rs-61
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:16:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1W03U7-0003Um-Ot
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:16:29 -0500
Received: from mx1.redhat.com ([209.132.183.28]:29986)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1W03U7-0003Ue-Gq
	for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:16:23 -0500
Date: Mon, 6 Jan 2014 14:16:13 +0800
From: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20140106061613.GC20766@stefanha-thinkpad.redhat.com>
References: <1388972947-10423-1-git-send-email-famz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1388972947-10423-1-git-send-email-famz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] qemu-iotests: Remove duplicated error
 message line in 051.out
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: kwolf@redhat.com, Peter Lieven <pl@kamp.de>, qemu-devel@nongnu.org

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