diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-02 15:13:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-02 15:13:24 +0100 |
| commit | b21c2751b6448414613002cf544eb6a475c4cfe2 (patch) | |
| tree | 9d55afd7f69959e924a4d4aea37bd1dd35b86308 /io/channel-socket.c | |
| parent | d3d183a638d6a3ead515618a6547b3f80d39fcb9 (diff) | |
| parent | 8bd9c4e6c565c566a6cba3470cb2d4ea63994143 (diff) | |
| download | qemu-b21c2751b6448414613002cf544eb6a475c4cfe2.zip qemu-b21c2751b6448414613002cf544eb6a475c4cfe2.tar.gz qemu-b21c2751b6448414613002cf544eb6a475c4cfe2.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170802a' into staging
Migration pull 2017-08-02
Just minor fixes for 2.10
# gpg: Signature made Wed 02 Aug 2017 14:55:21 BST
# gpg: using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20170802a:
io: fix qio_channel_socket_accept err handling
migration: fix comment disorder in RAMState
migration: fix small leaks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-socket.c')
| -rw-r--r-- | io/channel-socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c index 53386b7..591d27e 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -340,10 +340,11 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr, &cioc->remoteAddrLen); if (cioc->fd < 0) { - trace_qio_channel_socket_accept_fail(ioc); if (errno == EINTR) { goto retry; } + error_setg_errno(errp, errno, "Unable to accept connection"); + trace_qio_channel_socket_accept_fail(ioc); goto error; } |