From patchwork Fri Oct 19 13:31:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192716 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 9CFB92C008F for ; Sat, 20 Oct 2012 01:17:22 +1100 (EST) Received: from localhost ([::1]:39660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCiX-0007Km-O0 for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 09:34:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCiE-0006uq-0U for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPCi3-0006eN-97 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:05 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCi3-0006Qo-2g for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:55 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so437208pbb.4 for ; Fri, 19 Oct 2012 06:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=973EsyjmYfK4R9xDi0AIkyWt8ge4X91LDjBaHYpVP2g=; b=gDFu06YyiFHsEr97+SR3mUnCNfwRZwnKcvsbJGDqPIQst4bw2/Dw51gBBJbLa0pgEd n3s5aAe0lT5677DpDp4UGbaZi4kbMkybpm/VvlYaSCskhYIGEuPRY5j5ZknY7YIcJaty UJ9546G9DBTwDDssKTCkyBQjNdGATmyZsQM1rmyhOG+R4lZ1jFdm01RMXirfKroSbc7V 5Acq2PV0CJD8mxuzN3ujvaDHtpHpQKmn9P5hJCyIZXa5hmYAYES8kMCkmCbbKbCYJZj4 yupSMeqYPojjOHCIDZLxFgjz6cVLaq3lVJQU1YS0cywD+UO1m+JLTstcQyX6venib6i1 gNOA== Received: by 10.68.189.132 with SMTP id gi4mr5691550pbc.111.1350653634680; Fri, 19 Oct 2012 06:33:54 -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 kr4sm1240726pbc.76.2012.10.19.06.33.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 06:33:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2012 15:31:58 +0200 Message-Id: <1350653528-5834-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-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.160.45 Subject: [Qemu-devel] [PATCH 19/29] qemu-sockets: add error propagation to inet_dgram_opts 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 Before: $ qemu-system-x86_64 -monitor udp:localhost:631@localhost:631 inet_dgram_opts: bind(ipv4,127.0.0.1,631): OK inet_dgram_opts failed chardev: opening backend "udp" failed After: $ x86_64-softmmu/qemu-system-x86_64 -monitor udp:localhost:631@localhost:631 qemu-system-x86_64: -monitor udp:localhost:631@localhost:631: Failed to bind socket: Address already in use chardev: opening backend "udp" failed Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- qemu-char.c | 1 - qemu-sockets.c | 34 ++++++++-------------------------- 2 file modificati, 8 inserzioni(+), 27 rimozioni(-) diff --git a/qemu-char.c b/qemu-char.c index 04b5c23..afe2bfb 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2105,7 +2105,6 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts) fd = inet_dgram_opts(opts, &local_err); if (fd < 0) { - fprintf(stderr, "inet_dgram_opts failed\n"); goto return_err; } diff --git a/qemu-sockets.c b/qemu-sockets.c index 88d58fe..078f7c1 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -396,8 +396,6 @@ int inet_dgram_opts(QemuOpts *opts, Error **errp) struct addrinfo ai, *peer = NULL, *local = NULL; const char *addr; const char *port; - char uaddr[INET6_ADDRSTRLEN+1]; - char uport[33]; int sock = -1, rc; /* lookup peer addr */ @@ -412,7 +410,7 @@ int inet_dgram_opts(QemuOpts *opts, Error **errp) addr = "localhost"; } if (port == NULL || strlen(port) == 0) { - fprintf(stderr, "inet_dgram: port not specified\n"); + error_setg(errp, "remote port not specified"); return -1; } @@ -422,8 +420,8 @@ int inet_dgram_opts(QemuOpts *opts, Error **errp) ai.ai_family = PF_INET6; if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) { - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); return -1; } @@ -442,44 +440,28 @@ int inet_dgram_opts(QemuOpts *opts, Error **errp) port = "0"; if (0 != (rc = getaddrinfo(addr, port, &ai, &local))) { - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); goto err; } /* create socket */ sock = qemu_socket(peer->ai_family, peer->ai_socktype, peer->ai_protocol); if (sock < 0) { - fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, - inet_strfamily(peer->ai_family), strerror(errno)); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); goto err; } setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(void*)&on,sizeof(on)); /* bind socket */ - if (getnameinfo((struct sockaddr*)local->ai_addr,local->ai_addrlen, - uaddr,INET6_ADDRSTRLEN,uport,32, - NI_NUMERICHOST | NI_NUMERICSERV) != 0) { - fprintf(stderr, "%s: getnameinfo: oops\n", __FUNCTION__); - goto err; - } if (bind(sock, local->ai_addr, local->ai_addrlen) < 0) { - fprintf(stderr,"%s: bind(%s,%s,%d): OK\n", __FUNCTION__, - inet_strfamily(local->ai_family), uaddr, inet_getport(local)); + error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED); goto err; } /* connect to peer */ - if (getnameinfo((struct sockaddr*)peer->ai_addr, peer->ai_addrlen, - uaddr, INET6_ADDRSTRLEN, uport, 32, - NI_NUMERICHOST | NI_NUMERICSERV) != 0) { - fprintf(stderr, "%s: getnameinfo: oops\n", __FUNCTION__); - goto err; - } if (connect(sock,peer->ai_addr,peer->ai_addrlen) < 0) { - fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__, - inet_strfamily(peer->ai_family), - peer->ai_canonname, uaddr, uport, strerror(errno)); + error_set_errno(errp, errno, QERR_SOCKET_CONNECT_FAILED); goto err; }