From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Ic3-00026m-QJ for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Ic0-0008KI-Ar for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55012) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6Ibz-0008Ih-W2 for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02CF0C05AA4C for ; Thu, 4 May 2017 15:24:11 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-149.ams2.redhat.com [10.36.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C198F17990 for ; Thu, 4 May 2017 15:24:10 +0000 (UTC) From: Markus Armbruster Date: Thu, 4 May 2017 17:23:56 +0200 Message-Id: <1493911445-19568-20-git-send-email-armbru@redhat.com> In-Reply-To: <1493911445-19568-1-git-send-email-armbru@redhat.com> References: <1493911445-19568-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Message-Id: <1493192202-3184-8-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake [Commit message typo fixed] --- include/qemu/sockets.h | 11 ----------- util/qemu-sockets.c | 31 ------------------------------- 2 files changed, 42 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index a0b5cae..5c326db 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -121,17 +121,6 @@ SocketAddress *socket_remote_address(int fd, Error **errp); char *socket_address_to_string(struct SocketAddress *addr, Error **errp); /** - * socket_address_crumple: - * @addr_flat: the socket address to crumple - * - * Convert SocketAddress to SocketAddressLegacy. Caller is responsible - * for freeing with qapi_free_SocketAddressLegacy(). - * - * Returns: the argument converted to SocketAddressLegacy. - */ -SocketAddressLegacy *socket_address_crumple(SocketAddress *addr); - -/** * socket_address_flatten: * @addr: the socket address to flatten * diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index ad3ce65..31b5e8c 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1336,37 +1336,6 @@ char *socket_address_to_string(struct SocketAddress *addr, Error **errp) return buf; } -SocketAddressLegacy *socket_address_crumple(SocketAddress *addr_flat) -{ - SocketAddressLegacy *addr = g_new(SocketAddressLegacy, 1); - - switch (addr_flat->type) { - case SOCKET_ADDRESS_TYPE_INET: - addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; - addr->u.inet.data = QAPI_CLONE(InetSocketAddress, - &addr_flat->u.inet); - break; - case SOCKET_ADDRESS_TYPE_UNIX: - addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; - addr->u.q_unix.data = QAPI_CLONE(UnixSocketAddress, - &addr_flat->u.q_unix); - break; - case SOCKET_ADDRESS_TYPE_VSOCK: - addr->type = SOCKET_ADDRESS_LEGACY_KIND_VSOCK; - addr->u.vsock.data = QAPI_CLONE(VsockSocketAddress, - &addr_flat->u.vsock); - break; - case SOCKET_ADDRESS_TYPE_FD: - addr->type = SOCKET_ADDRESS_LEGACY_KIND_FD; - addr->u.fd.data = QAPI_CLONE(String, &addr_flat->u.fd); - break; - default: - abort(); - } - - return addr; -} - SocketAddress *socket_address_flatten(SocketAddressLegacy *addr_legacy) { SocketAddress *addr = g_new(SocketAddress, 1); -- 2.7.4