diff options
author | Markus Armbruster <armbru@redhat.com> | 2015-02-09 14:03:19 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-02-18 10:51:28 +0100 |
commit | 1677f4c66cf2228eb14f1b0571d0e3b38d0d6606 (patch) | |
tree | 7c103f0cc73fd4c8eb6e8a70483e740377cd4229 /net/socket.c | |
parent | 565f65d271984a32eed2c324ff6ef8be33f7f3d2 (diff) | |
download | qemu-1677f4c66cf2228eb14f1b0571d0e3b38d0d6606.zip qemu-1677f4c66cf2228eb14f1b0571d0e3b38d0d6606.tar.gz qemu-1677f4c66cf2228eb14f1b0571d0e3b38d0d6606.tar.bz2 |
monitor: Clean up around monitor_handle_fd_param()
monitor_handle_fd_param() is a wrapper around
monitor_handle_fd_param2() that feeds errors to qerror_report_err()
instead of returning them. qerror_report_err() is inappropriate in
many contexts. monitor_handle_fd_param() looks simpler than
monitor_handle_fd_param2(), which tempts use. Remove the temptation:
drop the wrapper and open-code the (trivial) error handling instead.
Replace the open-coded qerror_report_err() by error_report_err() in
places that already use error_report(). Turns out that's everywhere.
While there, rename monitor_handle_fd_param2() to monitor_fd_param().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 68a93cd..c30e03f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -695,6 +695,7 @@ static int net_socket_udp_init(NetClientState *peer, int net_init_socket(const NetClientOptions *opts, const char *name, NetClientState *peer) { + Error *err = NULL; const NetdevSocketOptions *sock; assert(opts->kind == NET_CLIENT_OPTIONS_KIND_SOCKET); @@ -715,8 +716,9 @@ int net_init_socket(const NetClientOptions *opts, const char *name, if (sock->has_fd) { int fd; - fd = monitor_handle_fd_param(cur_mon, sock->fd); + fd = monitor_fd_param(cur_mon, sock->fd, &err); if (fd == -1) { + error_report_err(err); return -1; } qemu_set_nonblock(fd); |