Commit 372a87a1 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

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



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: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20191018130716.25438-1-thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 30d6ff66

hw/misc/tmp421.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void tmp421_get_temperature(Object *obj, Visitor *v, const char *name, 
    int tempid;



    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;

    }
@@ -160,7 +160,7 @@ static void tmp421_set_temperature(Object *obj, Visitor *v, const char *name, 
    }



    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;

    }

util/main-loop.c

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static void sigfd_handler(void *opaque) 
        }



        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;

        }

util/systemd.c

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ unsigned int check_socket_activation(void) 
             * and we should exit.

             */

            error_report("Socket activation failed: "

                         "invalid file descriptor fd = %d: %m",

                         fd);

                         "invalid file descriptor fd = %d: %s",

                         fd, g_strerror(errno));

            exit(EXIT_FAILURE);

        }

    }