aboutsummaryrefslogtreecommitdiff
path: root/qga/main.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-04-26 09:36:39 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-05-09 09:14:40 +0200
commitdfd100f242370886bb6732f70f1f7cbd8eb9fedc (patch)
tree3ad4f17ad74b5b420f556ccea55b391a39d5a2c5 /qga/main.c
parent4626a19c86c30d96cedbac2bd44ef8103303cb37 (diff)
downloadqemu-dfd100f242370886bb6732f70f1f7cbd8eb9fedc.zip
qemu-dfd100f242370886bb6732f70f1f7cbd8eb9fedc.tar.gz
qemu-dfd100f242370886bb6732f70f1f7cbd8eb9fedc.tar.bz2
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/main.c')
-rw-r--r--qga/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/qga/main.c b/qga/main.c
index ad6f68f..cae4d7b 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) {