From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 10 Jun 2014 11:06:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140610-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3334e929ae2d01e47c3e64757ee7fcf975cede94;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140610-1' into staging

console: two little bugfixes.

# gpg: Signature made Tue 10 Jun 2014 12:01:07 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/kraxel/tags/pull-console-20140610-1:
  console: fix -vga none -sdl crash
  console: kill MAX_CONSOLES, alloc consoles dynamically

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

3334e929ae2d01e47c3e64757ee7fcf975cede94