[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] qemu-io: Fix 'map' output
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 07/11] qemu-io: Fix 'map' output |
Date: |
Fri, 24 May 2013 16:32:23 +0200 |
From: Kevin Wolf <address@hidden>
The output of the 'map' command in qemu-io used to directly resemble
bdrv_is_allocated() and could contain many lines for small chunks that
all have the same allocation status. After this patch, they will be
coalesced into a single output line for a large chunk.
As a side effect, the command gains some error handling.
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-io.c | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 475a8bd..5e6680b 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -1635,12 +1635,43 @@ static const cmdinfo_t alloc_cmd = {
.oneline = "checks if a sector is present in the file",
};
+
+static int map_is_allocated(int64_t sector_num, int64_t nb_sectors, int64_t
*pnum)
+{
+ int num, num_checked;
+ int ret, firstret;
+
+ num_checked = MIN(nb_sectors, INT_MAX);
+ ret = bdrv_is_allocated(bs, sector_num, num_checked, &num);
+ if (ret < 0) {
+ return ret;
+ }
+
+ firstret = ret;
+ *pnum = num;
+
+ while (nb_sectors > 0 && ret == firstret) {
+ sector_num += num;
+ nb_sectors -= num;
+
+ num_checked = MIN(nb_sectors, INT_MAX);
+ ret = bdrv_is_allocated(bs, sector_num, num_checked, &num);
+ if (ret == firstret) {
+ *pnum += num;
+ } else {
+ break;
+ }
+ }
+
+ return firstret;
+}
+
static int map_f(int argc, char **argv)
{
int64_t offset;
int64_t nb_sectors;
char s1[64];
- int num, num_checked;
+ int64_t num;
int ret;
const char *retstr;
@@ -1648,12 +1679,17 @@ static int map_f(int argc, char **argv)
nb_sectors = bs->total_sectors;
do {
- num_checked = MIN(nb_sectors, INT_MAX);
- ret = bdrv_is_allocated(bs, offset, num_checked, &num);
+ ret = map_is_allocated(offset, nb_sectors, &num);
+ if (ret < 0) {
+ error_report("Failed to get allocation status: %s",
strerror(-ret));
+ return 0;
+ }
+
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);
+ printf("[% 24" PRId64 "] % 8" PRId64 "/% 8" PRId64 " sectors %s "
+ "at offset %s (%d)\n",
+ offset << 9ULL, num, nb_sectors, retstr, s1, ret);
offset += num;
nb_sectors -= num;
--
1.8.1.4
- [Qemu-devel] [PULL 00/11] Block patches, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 02/11] block: move input parsing code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 03/11] block: package committing code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 05/11] block: make all steps in qmp_transaction() as callback, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 06/11] blockdev: Rename BlockdevAction -> TransactionAction, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 07/11] qemu-io: Fix 'map' output,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 08/11] qcow2.py: Subcommand for changing header fields, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 10/11] coroutine: protect global pool with a mutex, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 09/11] qemu-iotests: Try creating huge qcow2 image, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 01/11] block: package preparation code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 11/11] coroutine: stop using AioContext in CoQueue, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 04/11] block: package rollback code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24