From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOUZ4-0001Ik-JE for qemu-devel@nongnu.org; Fri, 14 Mar 2014 12:02:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOUYy-0003UF-Fg for qemu-devel@nongnu.org; Fri, 14 Mar 2014 12:02:30 -0400 Received: from mail-ee0-x232.google.com ([2a00:1450:4013:c00::232]:65358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOUYy-0003U7-6B for qemu-devel@nongnu.org; Fri, 14 Mar 2014 12:02:24 -0400 Received: by mail-ee0-f50.google.com with SMTP id c13so1543206eek.37 for ; Fri, 14 Mar 2014 09:02:23 -0700 (PDT) Date: Fri, 14 Mar 2014 17:02:20 +0100 From: Stefan Hajnoczi Message-ID: <20140314160220.GC23468@stefanha-thinkpad.redhat.com> References: <1394719868-24312-1-git-send-email-stefanha@redhat.com> <20140314012835.GE27767@G08FNSTD100614.fnst.cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140314012835.GE27767@G08FNSTD100614.fnst.cn.fujitsu.com> Subject: Re: [Qemu-devel] [PULL v2 for-2.0 00/24] Block patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi , Anthony Liguori On Fri, Mar 14, 2014 at 09:28:36AM +0800, Hu Tao wrote: > Do you forget this: https://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg05055.html? > I suppose it will go through the block queue. I forgot, sorry. Since I explicitly acked it during soft-freeze, I have tried to merge it for today's block pull request. Unfortunately there is a qemu-iotests failure (in addition to merge conflicts that I resolved manually): 082 2s ... [16:57:34] [16:57:36] - output mismatch (see 082.out.bad) --- 082.out 2014-03-14 15:15:20.187691443 +0100 +++ 082.out.bad 2014-03-14 16:57:36.321417402 +0100 @@ -64,7 +64,7 @@ backing_fmt Image format of the base image encryption Encrypt the image cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata) +preallocation Preallocation mode (allowed values: off, metadata, full) lazy_refcounts Postpone refcount updates Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M Please rebase the series, fix the qemu-iotests failure, and send one more revision. Thanks, Stefan