qemu-io: Make cvtnum() a wrapper around strtosz_suffix()

No reason to implement the same thing multiple times. A nice side effect
is that fractional numbers like 0.5M can be used in qemu-io now.

Signed-off-by: Kevin Wolf <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Signed-off-by: Stefan Hajnoczi <[email protected]>

diff --git a/cmd.c b/cmd.c
index 4e7579b9820a8d8118d0abe2510f06373562c792..214c6f757d5d16ca83676a32d2a669ad24ca9518 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -344,43 +344,6 @@ doneline(
 #define MEGABYTES(x)   ((long long)(x) << 20)
 #define KILOBYTES(x)   ((long long)(x) << 10)
 
-long long
-cvtnum(
-       char            *s)
-{
-       long long       i;
-       char            *sp;
-       int             c;
-
-       i = strtoll(s, &sp, 0);
-       if (i == 0 && sp == s)
-               return -1LL;
-       if (*sp == '\0')
-               return i;
-
-       if (sp[1] != '\0')
-               return -1LL;
-
-       c = qemu_tolower(*sp);
-       switch (c) {
-       default:
-               return i;
-       case 'k':
-               return KILOBYTES(i);
-       case 'm':
-               return MEGABYTES(i);
-       case 'g':
-               return GIGABYTES(i);
-       case 't':
-               return TERABYTES(i);
-       case 'p':
-               return PETABYTES(i);
-       case 'e':
-               return  EXABYTES(i);
-       }
-       return -1LL;
-}
-
 #define TO_EXABYTES(x) ((x) / EXABYTES(1))
 #define TO_PETABYTES(x)        ((x) / PETABYTES(1))
 #define TO_TERABYTES(x)        ((x) / TERABYTES(1))

diff --git a/cmd.h b/cmd.h
index 8e6f7538c4627e461bf69a46c6ff81f278f2e027..4dcfe885a4bf1d9a9aab1c2d8bc2d14d26632505 100644 (file)
--- a/cmd.h
+++ b/cmd.h
@@ -58,7 +58,6 @@ char **breakline(char *input, int *count);
 void doneline(char *input, char **vec);
 char *fetchline(void);
 
-long long cvtnum(char *s);
 void cvtstr(double value, char *str, size_t sz);
 
 struct timeval tsub(struct timeval t1, struct timeval t2);

diff --git a/qemu-io.c b/qemu-io.c
index 4288b8cc0fcb675d9d2d41ee2d7142ce6723ef6e..8a719a881cf1b6fe29c69cde63dc0c8dbaf14c7c 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -29,6 +29,12 @@ static BlockDriverState *bs;
 
 static int misalign;
 
+static int64_t cvtnum(const char *s)
+{
+    char *end;
+    return strtosz_suffix(s, &end, STRTOSZ_DEFSUFFIX_B);
+}
+
 /*
  * Parse the pattern argument to various sub-commands.
  *