Commit 31e40415 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Laurent Vivier
Browse files

cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h" 



"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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20190903120555.7551-1-philmd@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent f75ca627

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

include/qemu-common.h

+0 −1
Original line number Diff line number Diff line
@@ -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

include/qemu/cutils.h

+2 −0
Original line number Diff line number Diff line
@@ -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")

qapi/string-output-visitor.c

+1 −1
Original line number Diff line number Diff line
@@ -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"