From nobody Tue Nov 18 04:25:28 2025 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=1607362806; cv=none; d=zohomail.com; s=zohoarc; b=lyGmufXB0Ejy79HB8a5ZX8ZdgiX+5Oxuv1FmUnEZ4Np0fDw+TAivODbwqIJQ+4gkoL5uBMMYPGqJbC6kf4NJykNUC2hG0ayZOLfnEnSjtpO6ZFPelySiTv8gSoUrzYYOTxw5/tp+tfJEKCj1XFvBFGvK5wJBdPgOudja9CKTfUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607362806; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0b0nIb4z3fwwAs2dMbfWngMbJiYIlkSjfLZDloyZ91M=; b=J/V1LIYzBNnyWhbpvZaZZh5G/3PslBvop+htploENhAkHoAvRvkyRCn5jlXBtvMhsRD2vl7hmrRylhX16/cGuZ8tno5uOcBZvV0sVQ3XkcVC+Vty/FwBm5U4RVNYLpgDsd+W+iihV76/WW0G0lW55LaeBc5RxHnf7qPdbO7F/q0= 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 1607362806073337.7118432099321; Mon, 7 Dec 2020 09:40:06 -0800 (PST) Received: from localhost ([::1]:55602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmKUV-0004G0-CY for importer@patchew.org; Mon, 07 Dec 2020 12:40:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmKGH-00015G-N2 for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:25:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmKGA-0006yt-Dw for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:25:21 -0500 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-517-SFTDohlANt-CGxrGmvIJfw-1; Mon, 07 Dec 2020 12:25:10 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0986B858181; Mon, 7 Dec 2020 17:25:09 +0000 (UTC) Received: from localhost (ovpn-114-128.ams2.redhat.com [10.36.114.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A6145D6AB; Mon, 7 Dec 2020 17:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361911; 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: in-reply-to:in-reply-to:references:references; bh=0b0nIb4z3fwwAs2dMbfWngMbJiYIlkSjfLZDloyZ91M=; b=RYYUj9uRt6ynPe3qy3CkwOwK2V4lAAxWi6K9LX/lCLNSfrXJ6Nn7Ncbz1aOCnnf1W4gZKf qs/PgNkIDpE5TX0aJD5avabNpJMVv7+yROgIgTE0qL68uv2aDpWpgNQ0O+2fkwUjyvQZnE Wsaxu9e7dxM8krdvDmibvkdLu1mIFqI= X-MC-Unique: SFTDohlANt-CGxrGmvIJfw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] libqtest: add qtest_socket_server() Date: Mon, 7 Dec 2020 17:20:20 +0000 Message-Id: <20201207172030.251905-3-stefanha@redhat.com> In-Reply-To: <20201207172030.251905-1-stefanha@redhat.com> References: <20201207172030.251905-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , "Michael S . Tsirkin" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add an API that returns a new UNIX domain socket in the listen state. The code for this was already there but only used internally in init_socket(). This new API will be used by vhost-user-blk-test. Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/qtest/libqos/libqtest.h | 8 +++++++ tests/qtest/libqtest.c | 40 ++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index 724f65aa94..e5f1ec590c 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -132,6 +132,14 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ..= .) void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); =20 +/** + * qtest_socket_server: + * @socket_path: the UNIX domain socket path + * + * Create and return a listen socket file descriptor, or abort on failure. + */ +int qtest_socket_server(const char *socket_path); + /** * qtest_vqmp_fds: * @s: #QTestState instance to operate on. diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index e49f3a1e45..bc389d422b 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -81,24 +81,8 @@ static void qtest_client_set_rx_handler(QTestState *s, Q= TestRecvFn recv); =20 static int init_socket(const char *socket_path) { - struct sockaddr_un addr; - int sock; - int ret; - - sock =3D socket(PF_UNIX, SOCK_STREAM, 0); - g_assert_cmpint(sock, !=3D, -1); - - addr.sun_family =3D AF_UNIX; - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path); + int sock =3D qtest_socket_server(socket_path); qemu_set_cloexec(sock); - - do { - ret =3D bind(sock, (struct sockaddr *)&addr, sizeof(addr)); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); - g_assert_cmpint(ret, !=3D, -1); - ret =3D listen(sock, 1); - g_assert_cmpint(ret, !=3D, -1); - return sock; } =20 @@ -636,6 +620,28 @@ QDict *qtest_qmp_receive_dict(QTestState *s) return qmp_fd_receive(s->qmp_fd); } =20 +int qtest_socket_server(const char *socket_path) +{ + struct sockaddr_un addr; + int sock; + int ret; + + sock =3D socket(PF_UNIX, SOCK_STREAM, 0); + g_assert_cmpint(sock, !=3D, -1); + + addr.sun_family =3D AF_UNIX; + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path); + + do { + ret =3D bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + } while (ret =3D=3D -1 && errno =3D=3D EINTR); + g_assert_cmpint(ret, !=3D, -1); + ret =3D listen(sock, 1); + g_assert_cmpint(ret, !=3D, -1); + + return sock; +} + /** * Allow users to send a message without waiting for the reply, * in the case that they choose to discard all replies up until --=20 2.28.0