Message ID | 20200625152215.941773-33-mreitz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=LkHf=AG=nongnu.org=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44C5E90 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 25 Jun 2020 15:54:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 18C682089D for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 25 Jun 2020 15:54:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HpQ12+Gl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 18C682089D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1joUD2-0003Gz-9T for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Jun 2020 11:54:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mreitz@redhat.com>) id 1joTj1-0006OR-At for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36073 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from <mreitz@redhat.com>) id 1joTiz-0001Ki-Cn for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593098616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1bohRTXKhs8SJ9joqAmiNiJmiKVo3BQhl+UvgYAoY8g=; b=HpQ12+Gl6Xlp4i6RmLy/usqAvT9yZ9v+pIHPHpWsqcgbGnMW/rJEondQdyP2JdjeO73IEr SZtu3ZT9DKKXSFR7NhmmfwC4GW8APHGGbHeJNfyzmNuZAAVG3MGngcLiQjt5VnVvNMRXhy uiyTc/puitsgmKR8d2LWpA4BwhmXMEc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-fJ1pyAUaMtaMxm57fc6l1w-1; Thu, 25 Jun 2020 11:23:30 -0400 X-MC-Unique: fJ1pyAUaMtaMxm57fc6l1w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75307A0BE4; Thu, 25 Jun 2020 15:23:29 +0000 (UTC) Received: from localhost (ovpn-113-182.ams2.redhat.com [10.36.113.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 103077FEA0; Thu, 25 Jun 2020 15:23:28 +0000 (UTC) From: Max Reitz <mreitz@redhat.com> To: qemu-block@nongnu.org Subject: [PATCH v7 32/47] block-copy: Use CAF to find sync=top base Date: Thu, 25 Jun 2020 17:22:00 +0200 Message-Id: <20200625152215.941773-33-mreitz@redhat.com> In-Reply-To: <20200625152215.941773-1-mreitz@redhat.com> References: <20200625152215.941773-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 00:45:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Kevin Wolf <kwolf@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>, qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> |
Series |
block: Deal with filters
|
expand
|
On 25.06.2020 18:22, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block/block-copy.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/block-copy.c b/block/block-copy.c > index f7428a7c08..5e80569bb8 100644 > --- a/block/block-copy.c > +++ b/block/block-copy.c > @@ -437,8 +437,8 @@ static int block_copy_block_status(BlockCopyState *s, int64_t offset, > BlockDriverState *base; > int ret; > > - if (s->skip_unallocated && s->source->bs->backing) { > - base = s->source->bs->backing->bs; > + if (s->skip_unallocated) { > + base = bdrv_backing_chain_next(s->source->bs); > } else { > base = NULL; > } Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
diff --git a/block/block-copy.c b/block/block-copy.c index f7428a7c08..5e80569bb8 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -437,8 +437,8 @@ static int block_copy_block_status(BlockCopyState *s, int64_t offset, BlockDriverState *base; int ret; - if (s->skip_unallocated && s->source->bs->backing) { - base = s->source->bs->backing->bs; + if (s->skip_unallocated) { + base = bdrv_backing_chain_next(s->source->bs); } else { base = NULL; }
Signed-off-by: Max Reitz <mreitz@redhat.com> --- block/block-copy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)