Patchwork qemu-io: Make alloc output useful when nb_sectors=1

login
register
mail settings
Submitter Stefan Hajnoczi
Date Sept. 2, 2010, 9:38 a.m.
Message ID <1283420283-6619-1-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/63464/
State New
Headers show

Comments

Stefan Hajnoczi - Sept. 2, 2010, 9:38 a.m.
There is no indication whether or not the sector is allocated when
nb_sectors=1:

  sector allocated at offset 64 KiB

This message is produced whether or not the sector is allocated.

Simply use the same message as the plural case, I don't think the
English is so broken that we need special case output here:

  0/1 sectors allocated at offset 64 KiB

This change does not affect qemu-iotests since nb_sectors=1 is not used
there.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu-io.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
Kevin Wolf - Sept. 2, 2010, 10:02 a.m.
Am 02.09.2010 11:38, schrieb Stefan Hajnoczi:
> There is no indication whether or not the sector is allocated when
> nb_sectors=1:
> 
>   sector allocated at offset 64 KiB
> 
> This message is produced whether or not the sector is allocated.
> 
> Simply use the same message as the plural case, I don't think the
> English is so broken that we need special case output here:
> 
>   0/1 sectors allocated at offset 64 KiB
> 
> This change does not affect qemu-iotests since nb_sectors=1 is not used
> there.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/qemu-io.c b/qemu-io.c
index 2dbe20f..bd3bd16 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -1427,11 +1427,8 @@  alloc_f(int argc, char **argv)
 
 	cvtstr(offset, s1, sizeof(s1));
 
-	if (nb_sectors == 1)
-		printf("sector allocated at offset %s\n", s1);
-	else
-		printf("%d/%d sectors allocated at offset %s\n",
-			sum_alloc, nb_sectors, s1);
+	printf("%d/%d sectors allocated at offset %s\n",
+	       sum_alloc, nb_sectors, s1);
 	return 0;
 }