diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-03 14:07:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-03 14:07:49 +0100 |
| commit | b8e5671a8cd196e7262802ca895bf87d50416989 (patch) | |
| tree | e4fa16d504ec2bb2249a374c742ee8ccac12111b /chardev/char-socket.c | |
| parent | dafd95053611aa14dda40266857608d12ddce658 (diff) | |
| parent | a7077b8e354d90fec26c2921aa2dea85b90dff90 (diff) | |
| download | focaccia-qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.gz focaccia-qemu-b8e5671a8cd196e7262802ca895bf87d50416989.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging
chardev patches # gpg: Signature made Wed 03 Oct 2018 11:57:34 BST # gpg: using RSA key DAE8E10975969CE5 # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/elmarco/tags/chardev-pull-request: chardev: use a child source for qio input source chardev: mark the calls that allow an implicit mux monitor char.h: fix gtk-doc comment style chardev: unref if underlying chardev has no parent chardev: remove qemu_chr_fe_read_all() counter chardev: avoid crash if no associated address Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev/char-socket.c')
| -rw-r--r-- | chardev/char-socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 7cd0ae2824..a75b46d9fe 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -423,8 +423,12 @@ static void update_disconnected_filename(SocketChardev *s) Chardev *chr = CHARDEV(s); g_free(chr->filename); - chr->filename = SocketAddress_to_str("disconnected:", s->addr, - s->is_listen, s->is_telnet); + if (s->addr) { + chr->filename = SocketAddress_to_str("disconnected:", s->addr, + s->is_listen, s->is_telnet); + } else { + chr->filename = g_strdup("disconnected:socket"); + } } /* NB may be called even if tcp_chr_connect has not been |