Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

This commit is contained in:
Anthony Liguori 2011-08-08 14:38:42 -05:00
commit 986563b173
7 changed files with 44 additions and 19 deletions

View file

@ -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);