From 31e404151bddbfd7215e471b5822ea2e96024e02 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Tue, 3 Sep 2019 14:05:55 +0200 Subject: 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: Philippe Mathieu-Daudé Reviewed-by: John Snow Reviewed-by: Peter Xu Message-Id: <20190903120555.7551-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- include/qemu-common.h | 1 - include/qemu/cutils.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') 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") -- cgit v1.2.3-55-g7522 From 84b6ea05ea13628d0dd99e3582060b26b7a1225a Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 12 Sep 2019 15:57:26 +0200 Subject: kvm: Fix typo in header of kvm_device_access() Signed-off-by: Greg Kurz Message-Id: <156829664683.2070256.13400788010568373502.stgit@bahia.tls.ibm.com> Signed-off-by: Laurent Vivier --- include/sysemu/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 909bcd77cf..fd674772ab 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -308,7 +308,7 @@ int kvm_vm_check_attr(KVMState *s, uint32_t group, uint64_t attr); int kvm_device_check_attr(int fd, uint32_t group, uint64_t attr); /** - * kvm_device_access - set or get value of a specific vm attribute + * kvm_device_access - set or get value of a specific device attribute * @fd: The device file descriptor * @group: the group * @attr: the attribute of that group to set or get -- cgit v1.2.3-55-g7522