Le 03/09/2019 à 14:05, Philippe Mathieu-Daudé a écrit : > "qemu/cutils.h" contains various qemu_strtosz_*() functions > useful to convert strings to size. It seems natural to have > the opposite usage (from size to string) there too. > > The function definition is already in util/cutils.c. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > There are only 5 users, is it worthwhile renaming it qemu_sztostrt()? > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > block/qapi.c | 2 +- > include/qemu-common.h | 1 - > include/qemu/cutils.h | 2 ++ > qapi/string-output-visitor.c | 2 +- > 4 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/block/qapi.c b/block/qapi.c > index 15f1030264..7ee2ee065d 100644 > --- a/block/qapi.c > +++ b/block/qapi.c > @@ -23,7 +23,7 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > +#include "qemu/cutils.h" > #include "block/qapi.h" > #include "block/block_int.h" > #include "block/throttle-groups.h" > diff --git a/include/qemu-common.h b/include/qemu-common.h > index 0235cd3b91..8d84db90b0 100644 > --- a/include/qemu-common.h > +++ b/include/qemu-common.h > @@ -123,7 +123,6 @@ void qemu_hexdump(const char *buf, FILE *fp, const char > *prefix, size_t size); > int parse_debug_env(const char *name, int max, int initial); > > const char *qemu_ether_ntoa(const MACAddr *mac); > -char *size_to_str(uint64_t val); > void page_size_init(void); > > /* returns non-zero if dump is in progress, otherwise zero is > diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h > index 12301340a4..b54c847e0f 100644 > --- a/include/qemu/cutils.h > +++ b/include/qemu/cutils.h > @@ -155,6 +155,8 @@ int qemu_strtosz(const char *nptr, const char **end, > uint64_t *result); > int qemu_strtosz_MiB(const char *nptr, const char **end, uint64_t *result); > int qemu_strtosz_metric(const char *nptr, const char **end, uint64_t > *result); > > +char *size_to_str(uint64_t val); > + > /* used to print char* safely */ > #define STR_OR_NULL(str) ((str) ? (str) : "null") > > diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c > index 7ab64468d9..0d93605d77 100644 > --- a/qapi/string-output-visitor.c > +++ b/qapi/string-output-visitor.c > @@ -11,7 +11,7 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > +#include "qemu/cutils.h" > #include "qapi/string-output-visitor.h" > #include "qapi/visitor-impl.h" > #include "qemu/host-utils.h" >
Applied to my trivial-patches branch. Thanks, Laurent