From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri, 5 May 2017 16:04:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging
X-Git-Tag: v2.11.1~557
X-Git-Url: https://git.proxmox.com/?p=mirror_qemu.git;a=commitdiff_plain;h=dd1559bb267becbb838de41132ef60771d183e5d

Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging

# gpg: Signature made Thu 04 May 2017 12:42:10 PM BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# 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

* elmarco/tags/chr-tests-pull-request: (21 commits)
  tests: add /char/console test
  tests: add /char/udp test
  tests: add /char/socket test
  tests: add /char/file test
  tests: add /char/pipe test
  tests: add alias check in /char/ringbuf
  char-udp: flush as much buffer as possible
  char-socket: add 'connected' property
  char-socket: add 'addr' property
  char-socket: update local address after listen
  char-socket: introduce update_disconnected_filename()
  char: useless NULL check
  char: remove chardevs list
  char: remove qemu_chardev_add
  char: use /chardevs container instead of chardevs list
  vl: add todo note about root container cleanup
  char: add a /chardevs container
  container: don't leak container reference
  xen: use a better chardev type check
  mux: simplfy muxes_realize_done
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

dd1559bb267becbb838de41132ef60771d183e5d
diff --cc chardev/char-socket.c
index 175fb8c3ec,0118252002..9d5f062c62
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@@ -908,11 -883,10 +916,10 @@@ static void qmp_chardev_open_socket(Cha
      /* be isn't opened until we get a connection */
      *be_opened = false;
  
-     chr->filename = SocketAddress_to_str("disconnected:",
-                                          addr, is_listen, is_telnet);
+     update_disconnected_filename(s);
  
      if (is_listen) {
 -        if (is_telnet) {
 +        if (is_telnet || is_tn3270) {
              s->do_telnetopt = 1;
          }
      } else if (reconnect > 0) {