diff options
| author | Anthony Liguori | 2011-08-08 21:38:42 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-08 21:38:42 +0200 |
| commit | 986563b173ca2d4bd47b10455b19c86e5cd5bba2 (patch) | |
| tree | 25db73df4cb973bf86c58341cb82415ab8d2c90b /qemu-common.h | |
| parent | pci: remove support for pre memory API BARs (diff) | |
| parent | Remove #ifdef KVM_CAP_TSC_CONTROL (diff) | |
| download | qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.gz qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.tar.xz qemu-986563b173ca2d4bd47b10455b19c86e5cd5bba2.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'qemu-common.h')
| -rw-r--r-- | qemu-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-common.h b/qemu-common.h index 0fdecf1ede..74d5c4b962 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); |