From patchwork Fri Jun 22 15:08:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 166639 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 1A2A5B6FA8 for ; Sat, 23 Jun 2012 01:10:39 +1000 (EST) Received: from localhost ([::1]:41919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si5VM-0000eF-TY for incoming@patchwork.ozlabs.org; Fri, 22 Jun 2012 11:10:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si5Tz-0005Xo-8c for qemu-devel@nongnu.org; Fri, 22 Jun 2012 11:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Si5Tq-0007tI-QX for qemu-devel@nongnu.org; Fri, 22 Jun 2012 11:09:10 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:36827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si5Tq-0007sd-Hn for qemu-devel@nongnu.org; Fri, 22 Jun 2012 11:09:02 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 22 Jun 2012 16:08:58 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 22 Jun 2012 16:08:56 +0100 Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5MF8un92560196 for ; Fri, 22 Jun 2012 16:08:56 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5MF8tt7019228 for ; Fri, 22 Jun 2012 09:08:55 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5MF8tEt019216; Fri, 22 Jun 2012 09:08:55 -0600 From: Stefan Hajnoczi To: Kevin Wolf Date: Fri, 22 Jun 2012 16:08:43 +0100 Message-Id: <1340377726-5896-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1340377726-5896-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1340377726-5896-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12062215-2966-0000-0000-0000047D9DB9 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.109 Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [RFC 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 e535874..f496547 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -103,7 +103,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()