[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h" |
Date: |
Thu, 19 Sep 2019 15:54:37 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
"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é <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 15f103026473..7ee2ee065d24 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 0235cd3b912e..8d84db90b083 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 12301340a474..b54c847e0fef 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 7ab64468d9a5..0d93605d77a7 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"
--
2.21.0
- [Qemu-trivial] [PULL 0/8] Trivial branch patches, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 1/8] vfio: fix a typo, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 6/8] Fix cacheline detection on FreeBSD/powerpc., Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 8/8] configure: Add xkbcommon configure options, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 4/8] target/m68k/fpu_helper.c: rename the access arguments, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 5/8] build: Don't ignore qapi-visit-core.c, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 3/8] Replace '-machine accel=xyz' with '-accel xyz', Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 7/8] kvm: Fix typo in header of kvm_device_access(), Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h",
Laurent Vivier <=
- Re: [Qemu-devel] [PULL 0/8] Trivial branch patches, Peter Maydell, 2019/09/20