From patchwork Wed Oct 10 14:02:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 190666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9E92E2C008B for ; Thu, 11 Oct 2012 01:59:41 +1100 (EST) Received: from localhost ([::1]:58824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLxl5-0007OL-SO for incoming@patchwork.ozlabs.org; Wed, 10 Oct 2012 10:59:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLwtB-0002cS-FA for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLwt5-0002FN-Oi for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:03:57 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:43012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLwt5-00027x-IE for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:03:51 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so618733pad.4 for ; Wed, 10 Oct 2012 07:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=OSL8FqBeTgEB+dWDYNW2u08d5TaMu5q70Fq3891rbDE=; b=u4/NQEktvfaExsyCtATmszuJVgY+JNaxdNnem+yQW4vy+BDzkUhwWqIpmoKKgLoZyY YBZ0OI0oMXJRLQy+Ogv9bJ6s60QSHFL4zA6n7ih27ipyhcsr9yfMnjZpZjOb24qZVBbN 8/5+FVKGsU04b/xR++nkKniWkmOpD1ytMGPsNE+/AO15BPKfXjnzDU56XZv/RUCxkpts NR+ukRjPq8ky0LlxBshRz9ncP+e/HV7IrQjuMMg5ZAXKPxcPaxLlkwG9Q98xjH+xoKkI kRwBwVQVU4Ljo1P7DAIHjDsBXhmZBuJstbIdKRBjQT0yOhXBuRcM4dpWQMeLtgdC4RGO FWjA== Received: by 10.66.86.65 with SMTP id n1mr13080187paz.48.1349877831186; Wed, 10 Oct 2012 07:03:51 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm905723pav.26.2012.10.10.07.03.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 07:03:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Oct 2012 16:02:56 +0200 Message-Id: <1349877786-23514-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349877786-23514-1-git-send-email-pbonzini@redhat.com> References: <1349877786-23514-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 15/25] qemu-sockets: add error propagation to inet_connect_addr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org perror and fprintf can be removed because all clients can now consume Errors properly. However, we need to change the non-blocking connect handlers to take an Error, in order to improve error handling for migration with the TCP protocol. Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 15 ++++++--------- 1 file modificato, 6 inserzioni(+), 9 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 3c19463..d0e1a41 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -216,7 +216,7 @@ typedef struct ConnectState { } ConnectState; static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, - ConnectState *connect_state); + ConnectState *connect_state, Error **errp); static void wait_for_connect(void *opaque) { @@ -246,7 +246,7 @@ static void wait_for_connect(void *opaque) if (s->current_addr) { while (s->current_addr->ai_next != NULL && s->fd < 0) { s->current_addr = s->current_addr->ai_next; - s->fd = inet_connect_addr(s->current_addr, &in_progress, s); + s->fd = inet_connect_addr(s->current_addr, &in_progress, s, NULL); /* connect in progress */ if (in_progress) { return; @@ -263,7 +263,7 @@ static void wait_for_connect(void *opaque) } static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, - ConnectState *connect_state) + ConnectState *connect_state, Error **errp) { int sock, rc; @@ -271,8 +271,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, sock = qemu_socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); if (sock < 0) { - fprintf(stderr, "%s: socket(%s): %s\n", __func__, - inet_strfamily(addr->ai_family), strerror(errno)); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); return -1; } qemu_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); @@ -293,6 +292,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, connect_state); *in_progress = true; } else if (rc < 0) { + error_set_errno(errp, errno, QERR_SOCKET_CONNECT_FAILED); closesocket(sock); return -1; } @@ -375,7 +375,7 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, if (connect_state != NULL) { connect_state->current_addr = e; } - sock = inet_connect_addr(e, &in_progress, connect_state); + sock = inet_connect_addr(e, &in_progress, connect_state, errp); if (in_progress) { return sock; } else if (sock >= 0) { @@ -386,9 +386,6 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, break; } } - if (sock < 0) { - error_set(errp, QERR_SOCKET_CONNECT_FAILED); - } g_free(connect_state); freeaddrinfo(res); return sock;