Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190715' into staging
commitb9404bf592e7ba74180e1a54ed7a266ec6ee67f2
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 15 Jul 2019 11:22:07 +0000 (15 12:22 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 15 Jul 2019 11:22:07 +0000 (15 12:22 +0100)
tree9f9528b84422984d092284a928e85eff30034861
parent298ad7b5a4519d2ae547df46103b2f8d49ca6f95
parentea73f37062a9012a4f151f47f2427011b18569c8
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190715' into staging

HMP pull 2019-07-15

Just Christophe's build fix

# gpg: Signature made Mon 15 Jul 2019 12:13:54 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20190715:
  Fix build error when VNC is configured out

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