From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 2 Sep 2014 09:26:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140902-1' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30eaca3acdf17d7bcbd1213eb149c02037edfb0b;p=osstest%2Fqemu.git

Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140902-1' into staging

sanity check for qxl, minor spice display channel tweak.

# gpg: Signature made Tue 02 Sep 2014 09:53:39 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20140902-1:
  spice: use console index as display id
  qxl-render: add more sanity checks

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

30eaca3acdf17d7bcbd1213eb149c02037edfb0b