From patchwork Tue Jan 21 17:14:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 313016 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 998562C0097 for ; Wed, 22 Jan 2014 04:14:56 +1100 (EST) Received: from localhost ([::1]:59709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5euc-0000nK-Fk for incoming@patchwork.ozlabs.org; Tue, 21 Jan 2014 12:14:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5euH-0000mh-06 for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:14:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5euB-0000YG-5m for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:14:32 -0500 Received: from mail-pd0-x233.google.com ([2607:f8b0:400e:c02::233]:46002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5euA-0000Y9-Ub for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:14:27 -0500 Received: by mail-pd0-f179.google.com with SMTP id q10so6419680pdj.10 for ; Tue, 21 Jan 2014 09:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=8Oo6ezJpzzXmYIz/hSe/HhSiuwqmH1R4KZkpdfF/fdk=; b=pw8Kz4S2GQJ9XbmiTw9AfXwDmM4tbNAkc+epoqDYdD1QMr+ChjR3LCs/Od2lnJW71o GsiWkwh98D0Jn7Wb+y6JyFoNUY6D3hm3HYlUFGIzVy9aFh63xBsMQYW7T9U+rgt11hMI kwGodY2NjDmJbPVd+4ghdnxF/TiBmzKVbW5pb/w+Do32B3RdskoEqwtopmPishdzZGNY kHjkiGkFFhMotxDS1F35DPJEX7bJjThLDPL1rnQMk9y2IO8XYH0pw7eetKeqRezzW/ip JYFABS4lDfxcbM1JM6WC0258vkVvNRdtl2tpqT/DD48MAmTz7ypzYBHT3npFbxeieE9m yccQ== X-Received: by 10.68.168.162 with SMTP id zx2mr26140173pbb.74.1390324465449; Tue, 21 Jan 2014 09:14:25 -0800 (PST) Received: from localhost.localdomain ([221.217.170.88]) by mx.google.com with ESMTPSA id nv7sm14086455pbc.31.2014.01.21.09.14.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 09:14:24 -0800 (PST) From: Liu Yuan To: sheepdog@lists.wpkg.org Date: Wed, 22 Jan 2014 01:14:11 +0800 Message-Id: <1390324451-14747-1-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.8.1.2 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::233 Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] sheepdog: fix 'qemu-img map' 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 It was muted in the previous commit 4bc74be9. Let's revive it since nothing prevents us to do it. With this patch, following command will work as other formats: $ qemu-img map sheepdog:image Cc: qemu-devel@nongnu.org Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan --- block/sheepdog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index b94ab6e..61aead0 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2442,11 +2442,12 @@ sd_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, { BDRVSheepdogState *s = bs->opaque; SheepdogInode *inode = &s->inode; - unsigned long start = sector_num * BDRV_SECTOR_SIZE / SD_DATA_OBJ_SIZE, + uint64_t offset = sector_num * BDRV_SECTOR_SIZE; + unsigned long start = offset / SD_DATA_OBJ_SIZE, end = DIV_ROUND_UP((sector_num + nb_sectors) * BDRV_SECTOR_SIZE, SD_DATA_OBJ_SIZE); unsigned long idx; - int64_t ret = BDRV_BLOCK_DATA; + int64_t ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset; for (idx = start; idx < end; idx++) { if (inode->data_vdi_id[idx] == 0) {