From nobody Mon Feb 9 07:22:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1573922204; cv=none; d=zoho.com; s=zohoarc; b=V7CrKALDXm7WmRVeFEo54euApYhukXYvjkgX7GSYJU/llTarAWcoo0+nMbZhaFHZMXdEFg+H0CK6nu2nTC15wX3JHj9Bv32L/Tp7jWZ/qrikI0H53wX9lRgRuGqjh47F46UxnikqHoWH3lso7KtwTINl4wBBl06kJyz9jbii+fY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573922204; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PlPAAB7R/KUBVo6XLcV5kU+z6zeYClKX47OgC201kcM=; b=PpeuO4mdAq8w0MABNLsR10R3gBaeBcG94Hu6z+RklWQMv4HhJg4uKqHVtH3Enz2IFSn0IdmuHNUUyzSe5bW9n9qVydldVdZQH1A4kEj9Hb17yCBAD/GxtuDYT0AqANv9IqeMKfCQCnnNwk1+QR6XNzZi/uwKQBjK0MTgR8WI9a8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573922204167773.9371925632627; Sat, 16 Nov 2019 08:36:44 -0800 (PST) Received: from localhost ([::1]:48966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iW13y-0007f0-Va for importer@patchew.org; Sat, 16 Nov 2019 11:36:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iW11i-00051u-Ec for qemu-devel@nongnu.org; Sat, 16 Nov 2019 11:34:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iW11h-0005TB-9L for qemu-devel@nongnu.org; Sat, 16 Nov 2019 11:34:22 -0500 Received: from relay.sw.ru ([185.231.240.75]:37800) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iW11f-0005RU-3r; Sat, 16 Nov 2019 11:34:19 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iW11Y-0005cn-GP; Sat, 16 Nov 2019 19:34:12 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 3/4] block/io: bdrv_common_block_status_above: support bs == base Date: Sat, 16 Nov 2019 19:34:09 +0300 Message-Id: <20191116163410.12129-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191116163410.12129-1-vsementsov@virtuozzo.com> References: <20191116163410.12129-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We are going to reuse bdrv_common_block_status_above in bdrv_is_allocated_above. bdrv_is_allocated_above may be called with include_base =3D=3D false and still bs =3D=3D base (for ex. from img_rebase= ()). So, support this corner case. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block/io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index df3ecf2430..f05b2e8ecc 100644 --- a/block/io.c +++ b/block/io.c @@ -2431,7 +2431,11 @@ static int coroutine_fn bdrv_co_block_status_above(B= lockDriverState *bs, int ret =3D 0; bool first =3D true; =20 - assert(include_base || bs !=3D base); + if (!include_base && bs =3D=3D base) { + *pnum =3D bytes; + return 0; + } + for (p =3D bs; include_base || p !=3D base; p =3D backing_bs(p)) { ret =3D bdrv_co_block_status(p, want_zero, offset, bytes, pnum, ma= p, file); --=20 2.21.0