[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract
From: |
Markus Armbruster |
Subject: |
[PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets |
Date: |
Mon, 2 Nov 2020 10:44:20 +0100 |
Commit 776b97d360 "qemu-sockets: add abstract UNIX domain socket
support" neglected to update qemu_chr_socket_address(). It shows
shows neither @abstract nor @tight. Fix that.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
chardev/char-socket.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 1ee5a8c295..dc1cf86ecf 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -443,10 +443,18 @@ static char *qemu_chr_socket_address(SocketChardev *s,
const char *prefix)
s->is_listen ? ",server" : "");
break;
case SOCKET_ADDRESS_TYPE_UNIX:
- return g_strdup_printf("%sunix:%s%s", prefix,
+ {
+ UnixSocketAddress *sa = &s->addr->u.q_unix;
+
+ return g_strdup_printf("%sunix:%s%s%s%s", prefix,
s->addr->u.q_unix.path,
+ sa->has_abstract && sa->abstract
+ ? ",abstract" : "",
+ sa->has_tight && sa->tight
+ ? ",tight" : "",
s->is_listen ? ",server" : "");
break;
+ }
case SOCKET_ADDRESS_TYPE_FD:
return g_strdup_printf("%sfd:%s%s", prefix, s->addr->u.fd.str,
s->is_listen ? ",server" : "");
--
2.26.2
- [PATCH v2 06/11] test-util-sockets: Test the complete abstract socket matrix, (continued)
- [PATCH v2 06/11] test-util-sockets: Test the complete abstract socket matrix, Markus Armbruster, 2020/11/02
- [PATCH v2 01/11] test-util-sockets: Plug file descriptor leak, Markus Armbruster, 2020/11/02
- [PATCH v2 08/11] sockets: Fix socket_sockaddr_to_address_unix() for abstract sockets, Markus Armbruster, 2020/11/02
- [PATCH v2 03/11] test-util-sockets: Clean up SocketAddress construction, Markus Armbruster, 2020/11/02
- [PATCH v2 10/11] sockets: Bypass "replace empty @path" for abstract unix sockets, Markus Armbruster, 2020/11/02
- [PATCH v2 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one(), Markus Armbruster, 2020/11/02
- [PATCH v2 07/11] sockets: Fix default of UnixSocketAddress member @tight, Markus Armbruster, 2020/11/02
- [PATCH v2 05/11] test-util-sockets: Synchronize properly, don't sleep(1), Markus Armbruster, 2020/11/02
- [PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets,
Markus Armbruster <=
[PATCH v2 11/11] sockets: Make abstract UnixSocketAddress depend on CONFIG_LINUX, Markus Armbruster, 2020/11/02