Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
commitfeff02089113839d233e40a9bd7134241de12d1d
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Jan 2019 09:26:33 +0000 (25 09:26 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Jan 2019 09:26:33 +0000 (25 09:26 +0000)
treee5ad08b42070e4360abac44966818dfca8cacecd
parent341b7186e7bf0ed94fbf9b7303dfe2fdf3b71ea6
parent73564c407caedf992a1c688b5fea776a8b56ba2a
Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging

Merge qio 2010/01/24

Fixes accidental deletion of VNC server UNIX listener socket

# gpg: Signature made Thu 24 Jan 2019 12:24:43 GMT
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/qio-next-pull-request:
  io: ensure UNIX client doesn't unlink server socket

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