]> git.proxmox.com Git - mirror_qemu.git/commit
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)
commit70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e
treebfe67453ce66e566de2c86ba009830dd269be525
parentb60a7726cc0f5cbb2aecdbba67aeaf54ffc2c9cf
parent151623353f4a3da4daec29d658c10ef3b57bd462
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140929-1' into staging

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>