From patchwork Wed Jul 25 12:21:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 173144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C28E62C0091 for ; Wed, 25 Jul 2012 22:22:33 +1000 (EST) Received: from localhost ([::1]:49388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su0bn-0001Vv-QH for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 08:22:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su0bR-00016K-Tv for qemu-devel@nongnu.org; Wed, 25 Jul 2012 08:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su0bL-000796-Gy for qemu-devel@nongnu.org; Wed, 25 Jul 2012 08:22:09 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:60675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su0bL-000790-9C for qemu-devel@nongnu.org; Wed, 25 Jul 2012 08:22:03 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jul 2012 13:21:52 +0100 Received: from d06nrmr1806.portsmouth.uk.ibm.com (9.149.39.193) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 25 Jul 2012 13:21:47 +0100 Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6PCLbnR2027640 for ; Wed, 25 Jul 2012 13:21:37 +0100 Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6PCLbh2016845 for ; Wed, 25 Jul 2012 06:21:37 -0600 Received: from localhost (sig-9-145-198-37.de.ibm.com [9.145.198.37]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6PCLaNB016834; Wed, 25 Jul 2012 06:21:37 -0600 From: Stefan Hajnoczi To: Date: Wed, 25 Jul 2012 13:21:21 +0100 Message-Id: <1343218884-14980-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343218884-14980-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343218884-14980-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072512-3548-0000-0000-000002A61596 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.112 Cc: Kevin Wolf , Khoa Huynh , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v2 4/7] qemu-iotests: ignore qemu-img create lazy_refcounts output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hide the default lazy_refcounts=off output from qemu-img like we do with other image creation options. This ensures that existing golden outputs continue to pass despite the new option that has been added. Note that this patch applies before the one that actually introduces the lazy_refcounts=on|off option. This ensures git-bisect(1) continues to work. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/common.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 5e3a524..cc4e39b 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -113,7 +113,8 @@ _make_test_img() sed -e "s# table_size=0##g" | \ sed -e "s# compat='[^']*'##g" | \ sed -e "s# compat6=off##g" | \ - sed -e "s# static=off##g" + sed -e "s# static=off##g" | \ + sed -e "s# lazy_refcounts=off##g" } _cleanup_test_img()