aboutsummaryrefslogtreecommitdiffstats
path: root/qemu-common.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-08 14:38:42 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-08 14:38:42 -0500
commit986563b173ca2d4bd47b10455b19c86e5cd5bba2 (patch)
tree25db73df4cb973bf86c58341cb82415ab8d2c90b /qemu-common.h
parent039523397fce67ccb15a9b71ef812f9a69286aa5 (diff)
parentac363c9042eb1010b88af0a202c09475ef909972 (diff)
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'qemu-common.h')
-rw-r--r--qemu-common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-common.h b/qemu-common.h
index 0fdecf1ed..74d5c4b96 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -157,6 +157,8 @@ int fcntl_setfl(int fd, int flag);
#define STRTOSZ_DEFSUFFIX_B 'B'
int64_t strtosz(const char *nptr, char **end);
int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix);
+int64_t strtosz_suffix_unit(const char *nptr, char **end,
+ const char default_suffix, int64_t unit);
/* path.c */
void init_paths(const char *prefix);