From patchwork Fri Mar 14 16:02:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 330373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 720EE2C00A5 for ; Sat, 15 Mar 2014 03:02:58 +1100 (EST) Received: from localhost ([::1]:45634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOUZU-0001MG-3P for incoming@patchwork.ozlabs.org; Fri, 14 Mar 2014 12:02:56 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=rb/hFR8/XYRazSdRzYP+4K+pKpN7P3vvJAZ/Sy+3GQU=; b=VtBdeVIM2yPwNFLXIYsTQZJXBqsqqWLKKlm+pN0WJsXgqP0k1W2keiQOeN10SsgIWo 7JjG2l/4HkNDhzY4FC0/pXqExEYru9uJf/cPn2Lv8HEZ2bZGFc35U629K+7kM7qsTC/P 7m08IJl06wOjeHFEJjXVjRgIJnL5meYwhAA4mwB92I+/NtAGo0cQKDpdSIUE3eaIVNrd MWYW0d/Fwo8G0W4ja1BKkDuiXplfRBcv54w7N1okXt0/s3kug2panBXZa2tINUklaTSS nA1momX4UCJQN36842I00HIXrCH6bI5fdDrTjvI8SO+Xtv3In8AhBWJPBwEQ+yxsFmEY rtCw== X-Received: by 10.15.45.130 with SMTP id b2mr9081582eew.28.1394812943207; Fri, 14 Mar 2014 09:02:23 -0700 (PDT) Received: from localhost (95-91-232-57-dynip.superkabel.de. [95.91.232.57]) by mx.google.com with ESMTPSA id a4sm16081694eep.12.2014.03.14.09.02.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Mar 2014 09:02:22 -0700 (PDT) Date: Fri, 14 Mar 2014 17:02:20 +0100 From: Stefan Hajnoczi To: Hu Tao 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-Disposition: inline In-Reply-To: <20140314012835.GE27767@G08FNSTD100614.fnst.cn.fujitsu.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::232 Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi , Anthony Liguori Subject: Re: [Qemu-devel] [PULL v2 for-2.0 00/24] Block patches 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 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) Please rebase the series, fix the qemu-iotests failure, and send one more revision. Thanks, Stefan --- 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