From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 23 Oct 2015 09:24:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfbe0642ef8e643e7e41956c8ca97f1acc9464a9;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

vhost: build fix

Fix build breakages when using older gcc.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 22 Oct 2015 20:36:07 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  vhost-user: fix up rhel6 build

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

dfbe0642ef8e643e7e41956c8ca97f1acc9464a9