From nobody Sun May 19 00:47:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600421739; cv=none; d=zohomail.com; s=zohoarc; b=jpAZUm4+YTo9M9OLtrvy7Y0rFOGTfx2BoZETBRxWD6ZtCQAv0nlAxFnyS2yx+yPjdYwAPumSXJbFtw8L3OV6fa0tLyS0CdCjr3Cv9iIY0IpgSLEkSOM8J9oNZ9BJwywPedIv13SVpAhJlQ99OvFl//Iop3LZ19+9HaGOnUc/ocM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600421739; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=bhCgdRonuqJbY5hDJn2SqfLHKZfK3o5DLvfcBi77GYU=; b=Hi6dQuaDc6OdsRMQFgOJrZPDxQdM4NOnPOr9pZaH6gG6cOHHxKBR0Pva98B6Sr1ZVNdbP3AAIam4A3bzOjQQrRfmJfOIYUIXx28vNG1EfrT76BXi4ioOcOY99bXFGo4ATEb77ZEoLenLfCEm+LBS5anToIvPLma3lb1C0C2RkGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600421739084397.3601045170309; Fri, 18 Sep 2020 02:35:39 -0700 (PDT) Received: from localhost ([::1]:42880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJCnp-00019h-Kz for importer@patchew.org; Fri, 18 Sep 2020 05:35:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJCn1-0000ej-Om for qemu-devel@nongnu.org; Fri, 18 Sep 2020 05:34:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJCmz-0005i1-Uh for qemu-devel@nongnu.org; Fri, 18 Sep 2020 05:34:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-IRtOO_4iNgKECGMrEX0XNQ-1; Fri, 18 Sep 2020 05:34:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E84C188C12D; Fri, 18 Sep 2020 09:34:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-161.ams2.redhat.com [10.36.113.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 296091002D46; Fri, 18 Sep 2020 09:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600421684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bhCgdRonuqJbY5hDJn2SqfLHKZfK3o5DLvfcBi77GYU=; b=OBGUS0805Fl0ywK+OGq1LXj3UT+DkxapDTbumEVKFwh81NNZaJyixv8Ch9tiTgRHX4bUSj vwO09vcycwoT3e5vL7+xLxF3r80vD5vbAouUnKEjkRO2LptQmu8SVGVDvkc4o/RUe6WPWQ hIEZ9JVMDUwaZxJ+9jPYCrqf0Uy9qOE= X-MC-Unique: IRtOO_4iNgKECGMrEX0XNQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] util: include the target address in socket connect failures Date: Fri, 18 Sep 2020 10:34:36 +0100 Message-Id: <20200918093436.1775120-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 00:20:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.997, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reporting "Failed to connect socket" is essentially useless for a user attempting to diagnose failure. It needs to include the target addres details. Simiarly when failing to create a socket we should include the socket family info, so the user understands what particular feature was missing in their kernel build (IPv6, VSock in particular). Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/162.out | 4 ++-- util/qemu-sockets.c | 32 +++++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/qemu-iotests/162.out b/tests/qemu-iotests/162.out index 5a00d36d17..f8714cb0d2 100644 --- a/tests/qemu-iotests/162.out +++ b/tests/qemu-iotests/162.out @@ -6,8 +6,8 @@ image: nbd://localhost:PORT image: nbd+unix://?socket=3D42 =20 =3D=3D=3D SSH =3D=3D=3D -qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "por= t": "0", "path": "/foo"}': Failed to connect socket: Connection refused -qemu-img: Could not open 'driver=3Dssh,host=3Dlocalhost,port=3D0,path=3D/f= oo': Failed to connect socket: Connection refused +qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "por= t": "0", "path": "/foo"}': Failed to connect to 'localhost:0': Connection r= efused +qemu-img: Could not open 'driver=3Dssh,host=3Dlocalhost,port=3D0,path=3D/f= oo': Failed to connect to 'localhost:0': Connection refused qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "por= t": 0.42, "path": "/foo"}': Parameter 'port' expects a number qemu-img: Could not open 'driver=3Dssh,host=3Dlocalhost,port=3D0.42,path= =3D/foo': Parameter 'port' expects a number =20 diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index b37d288866..dbf8e4dd0c 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -354,15 +354,15 @@ listen_ok: ((rc) =3D=3D -EINPROGRESS) #endif =20 -static int inet_connect_addr(struct addrinfo *addr, Error **errp); - -static int inet_connect_addr(struct addrinfo *addr, Error **errp) +static int inet_connect_addr(const InetSocketAddress *saddr, + struct addrinfo *addr, Error **errp) { int sock, rc; =20 sock =3D qemu_socket(addr->ai_family, addr->ai_socktype, addr->ai_prot= ocol); if (sock < 0) { - error_setg_errno(errp, errno, "Failed to create socket"); + error_setg_errno(errp, errno, "Failed to create socket family %d", + addr->ai_family); return -1; } socket_set_fast_reuse(sock); @@ -376,7 +376,8 @@ static int inet_connect_addr(struct addrinfo *addr, Err= or **errp) } while (rc =3D=3D -EINTR); =20 if (rc < 0) { - error_setg_errno(errp, errno, "Failed to connect socket"); + error_setg_errno(errp, errno, "Failed to connect to '%s:%s'", + saddr->host, saddr->port); closesocket(sock); return -1; } @@ -455,7 +456,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error = **errp) for (e =3D res; e !=3D NULL; e =3D e->ai_next) { error_free(local_err); local_err =3D NULL; - sock =3D inet_connect_addr(e, &local_err); + sock =3D inet_connect_addr(saddr, e, &local_err); if (sock >=3D 0) { break; } @@ -549,7 +550,8 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, /* create socket */ sock =3D qemu_socket(peer->ai_family, peer->ai_socktype, peer->ai_prot= ocol); if (sock < 0) { - error_setg_errno(errp, errno, "Failed to create socket"); + error_setg_errno(errp, errno, "Failed to create socket family %d", + peer->ai_family); goto err; } socket_set_fast_reuse(sock); @@ -562,7 +564,8 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, =20 /* connect to peer */ if (connect(sock,peer->ai_addr,peer->ai_addrlen) < 0) { - error_setg_errno(errp, errno, "Failed to connect socket"); + error_setg_errno(errp, errno, "Failed to connect to '%s:%s'", + addr, port); goto err; } =20 @@ -735,13 +738,15 @@ static bool vsock_parse_vaddr_to_sockaddr(const Vsock= SocketAddress *vaddr, return true; } =20 -static int vsock_connect_addr(const struct sockaddr_vm *svm, Error **errp) +static int vsock_connect_addr(const VsockSocketAddress *vaddr, + const struct sockaddr_vm *svm, Error **errp) { int sock, rc; =20 sock =3D qemu_socket(AF_VSOCK, SOCK_STREAM, 0); if (sock < 0) { - error_setg_errno(errp, errno, "Failed to create socket"); + error_setg_errno(errp, errno, "Failed to create socket family %d", + AF_VSOCK); return -1; } =20 @@ -754,7 +759,8 @@ static int vsock_connect_addr(const struct sockaddr_vm = *svm, Error **errp) } while (rc =3D=3D -EINTR); =20 if (rc < 0) { - error_setg_errno(errp, errno, "Failed to connect socket"); + error_setg_errno(errp, errno, "Failed to connect to '%s:%s'", + vaddr->cid, vaddr->port); closesocket(sock); return -1; } @@ -770,7 +776,7 @@ static int vsock_connect_saddr(VsockSocketAddress *vadd= r, Error **errp) return -1; } =20 - return vsock_connect_addr(&svm, errp); + return vsock_connect_addr(vaddr, &svm, errp); } =20 static int vsock_listen_saddr(VsockSocketAddress *vaddr, @@ -994,7 +1000,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr= , Error **errp) } while (rc =3D=3D -EINTR); =20 if (rc < 0) { - error_setg_errno(errp, -rc, "Failed to connect socket %s", + error_setg_errno(errp, -rc, "Failed to connect to '%s'", saddr->path); goto err; } --=20 2.26.2