From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 15 Jul 2019 11:22:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190715' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9404bf592e7ba74180e1a54ed7a266ec6ee67f2;p=qemu.git

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

b9404bf592e7ba74180e1a54ed7a266ec6ee67f2