[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/11] char-socket: Fix qemu_chr_socket_address() for abstract so
From: |
Markus Armbruster |
Subject: |
[PATCH 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets |
Date: |
Thu, 29 Oct 2020 14:38:31 +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.
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