diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:36:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:38:02 +0200 |
| commit | 673652a785efb5f7da342b49c80a1abf033c82a7 (patch) | |
| tree | 2f277cce43b50e85cca36d7354ba2dd7ffd14d41 /util/systemd.c | |
| parent | 856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4 (diff) | |
| parent | df84f17d1beabbb2aca39be18b21afc277cd6754 (diff) | |
| download | qemu-673652a785efb5f7da342b49c80a1abf033c82a7.zip qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.gz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.bz2 | |
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/systemd.c')
| -rw-r--r-- | util/systemd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/systemd.c b/util/systemd.c index d22e86c..1dd0367 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); } } |