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

Merge commit 'df84f17' into HEAD

Browse source 
This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-10-26 15:36:22 +02:00
commit 673652a785
46 changed files with 2224 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

3
util/main-loop.c
View file

@ -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;
}

4
util/systemd.c
View file

@ -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);
}
}