From patchwork Wed Oct 3 14:37:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188803 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 68B082C00C3 for ; Thu, 4 Oct 2012 01:15:42 +1000 (EST) Received: from localhost ([::1]:40038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQfk-0003Yw-HS for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 11:15:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5R-0005u3-Un for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ5L-0000Ns-Bc for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:09 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:39719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5L-0000Cn-63 for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:03 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so10061642pbb.4 for ; Wed, 03 Oct 2012 07:38:02 -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=5pDbZAt+W5Ogb4TjAUV6Oax+tahvlzMw4leYDWNchtw=; b=PIYCeGgcEnTV8u53i3yvCqZ2tmEMSHyDr91tMIdadhC427tGtT+f5tuEh71Co+tq52 Ck22tZ+qgYIFiWwQUWprtmNPUA7ORxoidewbj9CVl8zqyjMjYG9/wSxRJ32e8wGbWjCE g4V2JJyfcc9dAY2sWlxzTMtZLgai0lo70nGcX/cHW9eULD7Qz9j0iJlR3TuwCx6+dOtB WSpnS7Y8tq4kwl5APd2c4pKWYC4KI7q5fhozHFXXFWd4re7Yg4buyN9qjfrZIuwE7Ooj 3TakqlxeLUivAuhzpuDn/eu5lHlmC8kwwR+CKhFOipljReGDYHQei3Zg8mYhAVABeza2 yMBg== Received: by 10.66.89.6 with SMTP id bk6mr5396205pab.81.1349275082815; Wed, 03 Oct 2012 07:38:02 -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.37.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 07:38:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 16:37:01 +0200 Message-Id: <1349275025-5093-15-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.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 14/18] qemu-sockets: include strerror or gai_strerror output in error messages 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 Among others, before: $ qemu-system-x86_64 -chardev socket,port=12345,id=char inet_connect: host and/or port not specified chardev: opening backend "socket" failed After: $ x86_64-softmmu/qemu-system-x86_64 -chardev socket,port=12345,id=char qemu-system-x86_64: -chardev socket,port=12345,id=char: host and/or port not specified chardev: opening backend "socket" failed perror and fprintf can be removed because all clients can now consume Errors properly. Signed-off-by: Paolo Bonzini Reviewed-by: Luiz Capitulino --- qemu-sockets.c | 30 +++++++++--------------------- 1 file modificato, 9 inserzioni(+), 21 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 341ae21..8ab2d0c 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -120,8 +120,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) if ((qemu_opt_get(opts, "host") == NULL) || (qemu_opt_get(opts, "port") == NULL)) { - fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "host and/or port not specified"); return -1; } pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); @@ -138,9 +137,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) snprintf(port, sizeof(port), "%d", atoi(port) + port_offset); rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res); if (rc != 0) { - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); return -1; } @@ -151,10 +149,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) NI_NUMERICHOST | NI_NUMERICSERV); slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); if (slisten < 0) { - fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, - inet_strfamily(e->ai_family), strerror(errno)); if (!e->ai_next) { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); } continue; } @@ -176,24 +172,19 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) goto listen; } if (p == port_max) { - fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, - inet_strfamily(e->ai_family), uaddr, inet_getport(e), - strerror(errno)); if (!e->ai_next) { - error_set(errp, QERR_SOCKET_BIND_FAILED); + error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED); } } } closesocket(slisten); } - fprintf(stderr, "%s: FAILED\n", __FUNCTION__); freeaddrinfo(res); return -1; listen: if (listen(slisten,1) != 0) { - error_set(errp, QERR_SOCKET_LISTEN_FAILED); - perror("listen"); + error_set_errno(errp, errno, QERR_SOCKET_LISTEN_FAILED); closesocket(slisten); freeaddrinfo(res); return -1; @@ -325,9 +316,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) addr = qemu_opt_get(opts, "host"); port = qemu_opt_get(opts, "port"); if (addr == NULL || port == NULL) { - fprintf(stderr, - "inet_parse_connect_opts: host and/or port not specified\n"); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "host and/or port not specified"); return NULL; } @@ -341,9 +330,8 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) /* lookup */ rc = getaddrinfo(addr, port, &ai, &res); if (rc != 0) { - fprintf(stderr, "getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); return NULL; } return res;