[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/26] qemu-io: Make cvtnum() a wrapper around strtos
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 04/26] qemu-io: Make cvtnum() a wrapper around strtosz_suffix() |
Date: |
Fri, 7 Jun 2013 13:58:23 +0200 |
From: Kevin Wolf <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
cmd.c | 37 -------------------------------------
cmd.h | 1 -
qemu-io.c | 6 ++++++
3 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/cmd.c b/cmd.c
index 4e7579b..214c6f7 100644
--- 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 8e6f753..4dcfe88 100644
--- 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 4288b8c..8a719a8 100644
--- 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.
*
--
1.8.1.4
- [Qemu-devel] [PULL 00/26] Block patches, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 01/26] blockdev: reset werror/rerror on drive_del, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 02/26] qemu-io: Remove unused args_command, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 03/26] cutils: Support 'P' and 'E' suffixes in strtosz(), Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 04/26] qemu-io: Make cvtnum() a wrapper around strtosz_suffix(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 05/26] qemu-io: Handle cvtnum() errors in 'alloc', Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 06/26] qemu-io: Don't use global bs in command implementations, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 08/26] qemu-io: Factor out qemuio_command, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 09/26] qemu-io: Move 'help' function, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 11/26] qemu-io: Move qemu_strsep() to cutils.c, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 10/26] qemu-io: Move 'quit' function, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 07/26] qemu-io: Split off commands to qemu-io-cmds.c, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 12/26] qemu-io: Move functions for registering and running commands, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 13/26] qemu-io: Move command_loop() and friends, Stefan Hajnoczi, 2013/06/07
- [Qemu-devel] [PULL 14/26] qemu-io: Move remaining helpers from cmd.c, Stefan Hajnoczi, 2013/06/07