From patchwork Fri Oct 22 13:43:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 68852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D4B0FB6EED for ; Sat, 23 Oct 2010 00:56:07 +1100 (EST) Received: from localhost ([127.0.0.1]:41069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9I6G-0000o9-Ns for incoming@patchwork.ozlabs.org; Fri, 22 Oct 2010 09:56:04 -0400 Received: from [140.186.70.92] (port=43248 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9Hu9-0002Il-E7 for qemu-devel@nongnu.org; Fri, 22 Oct 2010 09:43:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9Hu8-0003Et-0R for qemu-devel@nongnu.org; Fri, 22 Oct 2010 09:43:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50561) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9Hu7-0003Ej-Pc for qemu-devel@nongnu.org; Fri, 22 Oct 2010 09:43:31 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9MDhTus009970 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Oct 2010 09:43:30 -0400 Received: from dhcp-5-188.str.redhat.com (vpn2-8-219.ams2.redhat.com [10.36.8.219]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9MDhEcw015077; Fri, 22 Oct 2010 09:43:28 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 22 Oct 2010 15:43:51 +0200 Message-Id: <1287755036-27688-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1287755036-27688-1-git-send-email-kwolf@redhat.com> References: <1287755036-27688-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 06/11] qemu-io: New command map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The new map command in qemu-io lists all allocated/unallocated areas in an image file. Signed-off-by: Kevin Wolf --- qemu-io.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index b4e5cc8..ff353eb 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -1443,6 +1443,44 @@ static const cmdinfo_t alloc_cmd = { }; static int +map_f(int argc, char **argv) +{ + int64_t offset; + int64_t nb_sectors; + char s1[64]; + int num, num_checked; + int ret; + const char *retstr; + + offset = 0; + nb_sectors = bs->total_sectors; + + do { + num_checked = MIN(nb_sectors, INT_MAX); + ret = bdrv_is_allocated(bs, offset, num_checked, &num); + retstr = ret ? " allocated" : "not allocated"; + cvtstr(offset << 9ULL, s1, sizeof(s1)); + printf("[% 24" PRId64 "] % 8d/% 8d sectors %s at offset %s (%d)\n", + offset << 9ULL, num, num_checked, retstr, s1, ret); + + offset += num; + nb_sectors -= num; + } while(offset < bs->total_sectors); + + return 0; +} + +static const cmdinfo_t map_cmd = { + .name = "map", + .argmin = 0, + .argmax = 0, + .cfunc = map_f, + .args = "", + .oneline = "prints the allocated areas of a file", +}; + + +static int close_f(int argc, char **argv) { bdrv_close(bs); @@ -1680,6 +1718,7 @@ int main(int argc, char **argv) add_command(&length_cmd); add_command(&info_cmd); add_command(&alloc_cmd); + add_command(&map_cmd); add_args_command(init_args_command); add_check_command(init_check_command);