projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b60a772 1516233)
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140929-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Sep 2014 18:28:15 +0000 (19:28 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Sep 2014 18:28:15 +0000 (19:28 +0100)
add and use graphic_console_set_hwops

# gpg: Signature made Mon 29 Sep 2014 11:18:37 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-20140929-1:
  qxl: use graphic_console_set_hwops
  console: add graphic_console_set_hwops

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

Trivial merge
Domain: SDK / Emulator;