Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging
commit6c87d9f311dba0641bdc2df556056938a8bf2a12
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 13 Jul 2020 08:34:24 +0000 (13 09:34 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 13 Jul 2020 08:34:24 +0000 (13 09:34 +0100)
treee85ca32e9a70b92ed8078c2029299489169605f5
parent9f526fce49c6ac48114ed04914b5a76e4db75785
parent30827bad3852fd85d86995e7ccab429679442889
Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging

# gpg: Signature made Mon 13 Jul 2020 09:23:19 BST
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-AndrĂ© Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-AndrĂ© Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/chardev-pull-request:
  chardev: Extract system emulation specific code
  chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h"
  chardev: Restrict msmouse / wctablet / testdev to system emulation
  tests/test-char: Remove unused "chardev/char-mux.h" include
  monitor/misc: Remove unused "chardev/char-mux.h" include
  char: fix use-after-free with dup chardev & reconnect
  chardev: don't abort on attempt to add duplicated chardev
  char-socket: initialize reconnect timer only when the timer doesn't start

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>