From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFk3x-0004Gv-PW for qemu-devel@nongnu.org; Wed, 22 Jun 2016 11:27:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFk3q-0004tK-K5 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 11:27:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46317) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFk3q-0004sG-Ei for qemu-devel@nongnu.org; Wed, 22 Jun 2016 11:27:26 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04ACDA3059 for ; Wed, 22 Jun 2016 15:27:23 +0000 (UTC) Received: from wei-thinkpad.nay.redhat.com (vpn1-6-208.pek2.redhat.com [10.72.6.208]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5MFRKv9002290 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 22 Jun 2016 11:27:22 -0400 References: <1464712247-11655-4-git-send-email-wexu@redhat.com> From: Wei Xu Message-ID: <576AAE58.2000503@redhat.com> Date: Wed, 22 Jun 2016 23:27:20 +0800 MIME-Version: 1.0 In-Reply-To: <1464712247-11655-4-git-send-email-wexu@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC Patch 3/3] sockets: replace creating a new socket with the record one List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org There has been comments on this patch, but i forgot adding this patch to the list, just forward it again. Both server mode and client mode are supported. Signed-off-by: Wei Xu --- util/qemu-sockets.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 0d6cd1f..e6429d7 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -713,10 +713,14 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, struct sockaddr_un un; int sock, fd; - sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { - error_setg_errno(errp, errno, "Failed to create Unix socket"); - return -1; + if (saddr->sockfd) { + sock = saddr->sockfd; + } else { + sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) { + error_setg_errno(errp, errno, "Failed to create Unix socket"); + return -1; + } } memset(&un, 0, sizeof(un)); @@ -786,11 +790,16 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp, return -1; } - sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { - error_setg_errno(errp, errno, "Failed to create socket"); - return -1; + if (saddr->sockfd) { + sock = saddr->sockfd; + } else { + sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) { + error_setg_errno(errp, errno, "Failed to create socket"); + return -1; + } } + if (callback != NULL) { connect_state = g_malloc0(sizeof(*connect_state)); connect_state->callback = callback; -- 2.7.1