From patchwork Wed Oct 3 14:37:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188809 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 3451E2C0090 for ; Thu, 4 Oct 2012 01:33:06 +1000 (EST) Received: from localhost ([::1]:58255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5l-0006QW-53 for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 10:38:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5X-0005ze-JU for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ5O-0000PI-Sz for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:15 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5O-0000GD-Nn for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:06 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so6493677pad.4 for ; Wed, 03 Oct 2012 07:38:06 -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=/NbiO78h/KBHwKz3p5mpMLezD2eyvf/41x+aN3OysJg=; b=hH81OVK85Fp8hqVga6k4YxOJjCyajZ7zDdd94FpOhO2Cl279wpn2tAWVQjv3iRT6na kSLVs6DSJAk5WWv3zOe1J8K6l3NAQbbsa8USpYjLbFWGa+3PesRRTnnYhCfsjyBjShOa gYRAkFN72+m/UUywG9WFcURpqgjsIEPiC8AcPfRBkUcGJlTKaeU18HXWzUdrQz0St7RP Cx8ySCmyJ0/f97wsPP/3xXgc5AlAGe4e1pf9f5x9bfRDToJGpifzXZQXgoaQ724ti7h0 Zv6msuWDMDlstvrUExMc6xThtUCZlRNSMaA8lsuw9DpM1if/1MrrRVrscllE/81cCYpl RtOQ== Received: by 10.68.136.229 with SMTP id qd5mr13327136pbb.154.1349275086364; Wed, 03 Oct 2012 07:38:06 -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 i1sm2566228pay.26.2012.10.03.07.38.03 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 07:38:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 16:37:02 +0200 Message-Id: <1349275025-5093-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-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/18] 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. 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 8ab2d0c..b096f49 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; @@ -264,7 +264,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; @@ -272,8 +272,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; } setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); @@ -294,6 +293,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; } @@ -376,7 +376,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) { @@ -387,9 +387,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;