diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-04-26 09:36:39 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-05-09 09:14:40 +0200 |
| commit | dfd100f242370886bb6732f70f1f7cbd8eb9fedc (patch) | |
| tree | 3ad4f17ad74b5b420f556ccea55b391a39d5a2c5 /qga | |
| parent | 4626a19c86c30d96cedbac2bd44ef8103303cb37 (diff) | |
sockets: Rename SocketAddress to SocketAddressLegacy
The next commit will rename SocketAddressFlat to SocketAddress, and
the commit after that will replace most uses of SocketAddressLegacy by
SocketAddress, replacing most of this commit's renames right back.
Note that checkpatch emits a few "line over 80 characters" warnings.
The long lines are all temporary; the SocketAddressLegacy replacement
will shorten them again.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1493192202-3184-5-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/channel-posix.c | 4 | ||||
| -rw-r--r-- | qga/main.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 3f34465159..65ab8eb634 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -203,7 +203,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, case GA_CHANNEL_VSOCK_LISTEN: { if (fd < 0) { Error *local_err = NULL; - SocketAddress *addr; + SocketAddressLegacy *addr; char *addr_str; addr_str = g_strdup_printf("vsock:%s", path); @@ -216,7 +216,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, } fd = socket_listen(addr, &local_err); - qapi_free_SocketAddress(addr); + qapi_free_SocketAddressLegacy(addr); if (local_err != NULL) { g_critical("%s", error_get_pretty(local_err)); error_free(local_err); diff --git a/qga/main.c b/qga/main.c index ad6f68f187..cae4d7b36f 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1379,7 +1379,7 @@ int main(int argc, char **argv) goto end; } if (socket_activation) { - SocketAddress *addr; + SocketAddressLegacy *addr; g_free(config->method); g_free(config->channel_path); @@ -1388,13 +1388,13 @@ int main(int argc, char **argv) addr = socket_local_address(FIRST_SOCKET_ACTIVATION_FD, NULL); if (addr) { - if (addr->type == SOCKET_ADDRESS_KIND_UNIX) { + if (addr->type == SOCKET_ADDRESS_LEGACY_KIND_UNIX) { config->method = g_strdup("unix-listen"); - } else if (addr->type == SOCKET_ADDRESS_KIND_VSOCK) { + } else if (addr->type == SOCKET_ADDRESS_LEGACY_KIND_VSOCK) { config->method = g_strdup("vsock-listen"); } - qapi_free_SocketAddress(addr); + qapi_free_SocketAddressLegacy(addr); } if (!config->method) { |