[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 19/28] sockets: Delete unused helper socket_addres
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v3 19/28] sockets: Delete unused helper socket_address_crumple() |
Date: |
Tue, 9 May 2017 10:06:36 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[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 9e65ebe..d8183f7 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
- [Qemu-devel] [PULL v3 09/28] block: Simplify bdrv_append_temp_snapshot() logic, (continued)
- [Qemu-devel] [PULL v3 09/28] block: Simplify bdrv_append_temp_snapshot() logic, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 07/28] qobject: Add helper macros for common scalar insertions, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 25/28] qmp-shell: add -N option to skip negotiate, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 04/28] pci: Reduce scope of error injection, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 05/28] coccinelle: Add script to remove useless QObject casts, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 11/28] fdc-test: Avoid deprecated 'change' command, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 15/28] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 01/28] tests/check-qdict: Fix missing brackets, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 19/28] sockets: Delete unused helper socket_address_crumple(),
Markus Armbruster <=
- [Qemu-devel] [PULL v3 22/28] qapi: Document intended use of @name within alternate visits, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 17/28] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 21/28] qobject-input-visitor: Document full_name_nth(), Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 26/28] qmp-shell: Cope with query-commands error, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 08/28] qobject: Use simpler QDict/QList scalar insertion macros, Markus Armbruster, 2017/05/09
- [Qemu-devel] [PULL v3 02/28] test-keyval: fix leaks, Markus Armbruster, 2017/05/09