diff options
| author | Paolo Bonzini | 2019-10-26 15:36:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-10-26 15:38:02 +0200 |
| commit | 673652a785efb5f7da342b49c80a1abf033c82a7 (patch) | |
| tree | 2f277cce43b50e85cca36d7354ba2dd7ffd14d41 /util | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | mc146818rtc: always register rtc to rtc list (diff) | |
| download | qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.gz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.xz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.zip | |
Merge commit 'df84f17' into HEAD
This merge fixes a semantic conflict with the trivial tree.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/main-loop.c | 3 | ||||
| -rw-r--r-- | util/systemd.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/util/main-loop.c b/util/main-loop.c index e3eaa55866..eda63fe4e0 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -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; } diff --git a/util/systemd.c b/util/systemd.c index d22e86c707..1dd0367d9a 100644 --- a/util/systemd.c +++ b/util/systemd.c @@ -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); } } |