From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F1CAC433FF for ; Mon, 12 Aug 2019 18:13:12 +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 40A812067D for ; Mon, 12 Aug 2019 18:13:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40A812067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEog-00011J-KV for qemu-devel@archiver.kernel.org; Mon, 12 Aug 2019 14:13:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40986) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEnT-0007sG-6C for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxEnS-0004e7-AI for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:55 -0400 Received: from relay.sw.ru ([185.231.240.75]:50634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxEnQ-0004cK-94; Mon, 12 Aug 2019 14:11:52 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hxEnM-0001oT-O7; Mon, 12 Aug 2019 21:11:48 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Mon, 12 Aug 2019 21:11:45 +0300 Message-Id: <20190812181146.26121-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190812181146.26121-1-vsementsov@virtuozzo.com> References: <20190812181146.26121-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/2] block/raw-format: switch to BDRV_BLOCK_DATA with BDRV_BLOCK_RECURSE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" BDRV_BLOCK_RAW makes generic bdrv_co_block_status to fallthrough to returned file. But is it correct behavior at all? If returned file itself has a backing file, we may report as totally unallocated and area which actually has data in bottom backing file. So, mirroring of qcow2 under raw-format is broken. Which is illustrated by following commit with a test. Let's make raw-format behave more correctly returning BDRV_BLOCK_DATA. Suggested-by: Max Reitz Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/raw-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/raw-format.c b/block/raw-format.c index bffd424dd0..a273ee2387 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -275,7 +275,7 @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs, *pnum = bytes; *file = bs->file->bs; *map = offset + s->offset; - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; + return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_RECURSE; } static int coroutine_fn raw_co_pwrite_zeroes(BlockDriverState *bs, -- 2.18.0