From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 25 Jan 2019 09:26:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
X-Git-Tag: v4.0.0-rc0~142
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=feff02089113839d233e40a9bd7134241de12d1d;p=users%2Fdwmw2%2Fqemu.git

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>
---

feff02089113839d233e40a9bd7134241de12d1d