From 5179502918d0c230afb50d8b95247de440fccdd5 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Wed, 8 Oct 2014 07:11:56 -0500 Subject: qemu-sockets: Add error to non-blocking connect handler An error value here would be quite handy and more consistent with the rest of the code. Signed-off-by: Corey Minyard [Make sure SO_ERROR value is passed to error_setg_errno. - Paolo] Signed-off-by: Paolo Bonzini --- qemu-char.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qemu-char.c') diff --git a/qemu-char.c b/qemu-char.c index 62af0efa18..c71805ad8d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3042,11 +3042,13 @@ static void qemu_chr_finish_socket_connection(CharDriverState *chr, int fd) } } -static void qemu_chr_socket_connected(int fd, void *opaque) +static void qemu_chr_socket_connected(int fd, Error *err, void *opaque) { CharDriverState *chr = opaque; if (fd < 0) { + error_report("Unable to connect to char device %s: %s", + chr->label, error_get_pretty(err)); qemu_chr_socket_restart_timer(chr); return; } @@ -4079,7 +4081,8 @@ static gboolean socket_reconnect_timeout(gpointer opaque) } if (!qemu_chr_open_socket_fd(chr, &err)) { - error_report("Unable to connect to char device %s\n", chr->label); + error_report("Unable to connect to char device %s: %s\n", + chr->label, error_get_pretty(err)); qemu_chr_socket_restart_timer(chr); } -- cgit v1.2.1