From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, berrange@redhat.com, zxq_yx_007@163.com,
kraxel@redhat.com, pbonzini@redhat.com,
marcandre.lureau@redhat.com
Subject: [PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets
Date: Mon, 2 Nov 2020 10:44:20 +0100 [thread overview]
Message-ID: <20201102094422.173975-10-armbru@redhat.com> (raw)
In-Reply-To: <20201102094422.173975-1-armbru@redhat.com>
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
next prev parent reply other threads:[~2020-11-02 9:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 9:44 [PATCH v2 00/11] sockets: Attempt to drain the abstract socket swamp Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 01/11] test-util-sockets: Plug file descriptor leak Markus Armbruster
2020-11-02 14:10 ` Philippe Mathieu-Daudé
2020-11-02 9:44 ` [PATCH v2 02/11] test-util-sockets: Correct to set has_abstract, has_tight Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 03/11] test-util-sockets: Clean up SocketAddress construction Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one() Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 05/11] test-util-sockets: Synchronize properly, don't sleep(1) Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 06/11] test-util-sockets: Test the complete abstract socket matrix Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 07/11] sockets: Fix default of UnixSocketAddress member @tight Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 08/11] sockets: Fix socket_sockaddr_to_address_unix() for abstract sockets Markus Armbruster
2020-11-02 14:04 ` Eric Blake
2020-11-02 9:44 ` Markus Armbruster [this message]
2020-11-02 14:08 ` [PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() " Eric Blake
2020-11-03 6:28 ` Markus Armbruster
2020-11-03 13:17 ` Daniel P. Berrangé
2020-11-03 15:21 ` Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 10/11] sockets: Bypass "replace empty @path" for abstract unix sockets Markus Armbruster
2020-11-02 9:44 ` [PATCH v2 11/11] sockets: Make abstract UnixSocketAddress depend on CONFIG_LINUX Markus Armbruster
2020-11-02 14:12 ` Eric Blake
2020-11-03 6:35 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201102094422.173975-10-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zxq_yx_007@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).