From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0Ies-0003Hl-Ib for qemu-devel@nongnu.org; Fri, 19 Jul 2013 17:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V0Ieq-000193-2H for qemu-devel@nongnu.org; Fri, 19 Jul 2013 17:56:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0Iep-00018v-R7 for qemu-devel@nongnu.org; Fri, 19 Jul 2013 17:56:11 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6JLuAEr002287 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Jul 2013 17:56:11 -0400 Date: Fri, 19 Jul 2013 14:56:07 -0700 From: Ian Main Message-ID: <20130719215607.GF13675@gate.mains.priv> References: <1374091462-18391-1-git-send-email-imain@redhat.com> <1374091462-18391-2-git-send-email-imain@redhat.com> <51E823AF.6060200@redhat.com> <20130718190651.GC13675@gate.mains.priv> <51E84805.8030701@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <51E84805.8030701@redhat.com> Subject: Re: [Qemu-devel] [PATCH V4 1/4] Implement sync modes for drive-backup. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Stefan Hajnoczi On Thu, Jul 18, 2013 at 01:54:45PM -0600, Eric Blake wrote: > On 07/18/2013 01:06 PM, Ian Main wrote: > > On Thu, Jul 18, 2013 at 11:19:43AM -0600, Eric Blake wrote: > >> On 07/17/2013 02:04 PM, Ian Main wrote: > >>> This patch adds sync-modes to the drive-backup interface and > >>> implements the FULL, NONE and TOP modes of synchronization. > >>> > > >>> @@ -1807,6 +1807,10 @@ > >>> # @format: #optional the format of the new destination, default is to > >>> # probe if @mode is 'existing', else the format of the source > >>> # > >>> +# @sync: what parts of the disk image should be copied to the destination > >>> +# (all the disk, only the sectors allocated in the topmost image, or > >>> +# only new I/O). > >>> +# > >>> # @mode: #optional whether and how QEMU should create a new image, default is > >>> # 'absolute-paths'. > >> > >> This hunk looks bogus; the 'DriveBackup' type already documents @sync as > >> of commit b53169e, which makes me suspect this hunk got misapplied > >> during rebasing. > > > > Did you check that? I know there was one bit of documentation missing > > that I fixed here. I also just did a clean rebase (git am) to > > kevin/block and it all applied fine. > > Yes, it _applied_ fine, because of git's insistence on applying hunks > regardless of line fuzzing. It probably applied to 'drive-mirror', > since I see this context in the section for 'drive-mirror' when reading > the unpatched file at current qemu.git head: > > > # @format: #optional the format of the new destination, default is to > > # probe if @mode is 'existing', else the format of the source > > # > > # @mode: #optional whether and how QEMU should create a new image, default is > > # 'absolute-paths'. > > # > > Hence, my argument that you DON'T want this hunk. Ah, yes you are right. I'll fix it next rev along with other things mentioned. Ian