From patchwork Fri Jan 8 02:08:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 564571 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 661781402A9 for ; Fri, 8 Jan 2016 13:12:26 +1100 (AEDT) Received: from localhost ([::1]:33693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHMXQ-0000Gh-2J for incoming@patchwork.ozlabs.org; Thu, 07 Jan 2016 21:12:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHMUa-0002rF-CL for qemu-devel@nongnu.org; Thu, 07 Jan 2016 21:09:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHMUV-0000pb-Ma for qemu-devel@nongnu.org; Thu, 07 Jan 2016 21:09:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHMUP-0000oe-VS; Thu, 07 Jan 2016 21:09:18 -0500 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 (Postfix) with ESMTPS id B0E928D3B5; Fri, 8 Jan 2016 02:09:17 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-4-108.pek2.redhat.com [10.72.4.108]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0828F7D023345; Thu, 7 Jan 2016 21:09:12 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 8 Jan 2016 10:08:07 +0800 Message-Id: <1452218894-2388-9-git-send-email-famz@redhat.com> In-Reply-To: <1452218894-2388-1-git-send-email-famz@redhat.com> References: <1452218894-2388-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-block@nongnu.org, mreitz@redhat.com, Stefan Hajnoczi , pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v6 08/15] sheepdog: Assign bs to file in sd_co_get_block_status 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Fam Zheng --- block/sheepdog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index 0f6789e..d5e7ff8 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2740,6 +2740,9 @@ sd_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, if (*pnum > nb_sectors) { *pnum = nb_sectors; } + if (ret > 0 && ret & BDRV_BLOCK_OFFSET_VALID) { + *file = bs; + } return ret; }