motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not use %m in common code to print error messages

Browse source 
The %m format specifier is an extension from glibc - and when compiling
QEMU for NetBSD, the compiler correctly complains, e.g.:

/home/qemu/qemu-test.ELjfrQ/src/util/main-loop.c: In function 'sigfd_handler':
/home/qemu/qemu-test.ELjfrQ/src/util/main-loop.c:64:13: warning: %m is only
 allowed in syslog(3) like functions [-Wformat=]
             printf("read from sigfd returned %zd: %m\n", len);
             ^
Let's use g_strerror() here instead, which is an easy-to-use wrapper
around the thread-safe strerror_r() function.

While we're at it, also convert the "printf()" in main-loop.c into
the preferred "error_report()".

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20191018130716.25438-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2019-10-18 15:07:16 +02:00 • committed by Paolo Bonzini
parent 30d6ff662d
commit 372a87a1d9
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/misc/tmp421.c
View file

@ -120,7 +120,7 @@ static void tmp421_get_temperature(Object *obj, Visitor *v, const char *name,
int tempid; int tempid;
if (sscanf(name, "temperature%d", &tempid) != 1) { if (sscanf(name, "temperature%d", &tempid) != 1) {
error_setg(errp, "error reading %s: %m", name); error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
return; return;
} }
@ -160,7 +160,7 @@ static void tmp421_set_temperature(Object *obj, Visitor *v, const char *name,
} }
if (sscanf(name, "temperature%d", &tempid) != 1) { if (sscanf(name, "temperature%d", &tempid) != 1) {
error_setg(errp, "error reading %s: %m", name); error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
return; return;
} }

3
util/main-loop.c
View file

@ -61,7 +61,8 @@ static void sigfd_handler(void *opaque)
} }
if (len != sizeof(info)) { if (len != sizeof(info)) {
printf("read from sigfd returned %zd: %m\n", len); error_report("read from sigfd returned %zd: %s", len,
g_strerror(errno));
return; return;
} }

4
util/systemd.c
View file

@ -60,8 +60,8 @@ unsigned int check_socket_activation(void)
* and we should exit. * and we should exit.
*/ */
error_report("Socket activation failed: " error_report("Socket activation failed: "
"invalid file descriptor fd = %d: %m", "invalid file descriptor fd = %d: %s",
fd); fd, g_strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }