From nobody Fri Oct 18 09:17:44 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1706883905964210.98190031610068; Fri, 2 Feb 2024 06:25:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E00EB1D67; Fri, 2 Feb 2024 09:25:04 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 68AAC1C8B; Fri, 2 Feb 2024 09:21:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 20CAF1C41; Fri, 2 Feb 2024 09:20:44 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id EE9291C58 for ; Fri, 2 Feb 2024 09:20:40 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-7pP4QlMfM_CpZbcyXKALHg-1; Fri, 02 Feb 2024 09:20:39 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D3DF829AC00E for ; Fri, 2 Feb 2024 14:20:38 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C7D7200A08E for ; Fri, 2 Feb 2024 14:20:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 7pP4QlMfM_CpZbcyXKALHg-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/5] virsocket: Simplify virSocketSendFD() Date: Fri, 2 Feb 2024 15:20:33 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VJNXGA4NN4AGEMB2WCUC2BNOJKLOPRRF X-Message-ID-Hash: VJNXGA4NN4AGEMB2WCUC2BNOJKLOPRRF X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706883907617100001 After previous cleanups, virSocketSendFD() is but a thin wrapper over virSocketSendMsgWithFDs(). Replace the body of the former with a call to the latter. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/util/virsocket.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/util/virsocket.c b/src/util/virsocket.c index a7272a3ec9..c4e214e76a 100644 --- a/src/util/virsocket.c +++ b/src/util/virsocket.c @@ -388,32 +388,10 @@ int virSocketSendFD(int sock, int fd) { char byte =3D 0; - struct iovec iov; - struct msghdr msg =3D { 0 }; - struct cmsghdr *cmsg; - char buf[CMSG_SPACE(sizeof(fd))]; + int fds[] =3D { fd }; =20 - /* send at least one char */ - iov.iov_base =3D &byte; - iov.iov_len =3D 1; - msg.msg_iov =3D &iov; - msg.msg_iovlen =3D 1; - msg.msg_name =3D NULL; - msg.msg_namelen =3D 0; - - msg.msg_control =3D buf; - msg.msg_controllen =3D sizeof(buf); - cmsg =3D CMSG_FIRSTHDR(&msg); - cmsg->cmsg_level =3D SOL_SOCKET; - cmsg->cmsg_type =3D SCM_RIGHTS; - cmsg->cmsg_len =3D CMSG_LEN(sizeof(fd)); - /* Initialize the payload: */ - memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd)); - msg.msg_controllen =3D cmsg->cmsg_len; - - if (sendmsg(sock, &msg, 0) !=3D iov.iov_len) - return -1; - return 0; + return virSocketSendMsgWithFDs(sock, &byte, sizeof(byte), + fds, G_N_ELEMENTS(fds)); } =20 =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org