diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-29 19:28:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-29 19:28:15 +0100 |
| commit | 70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e (patch) | |
| tree | bfe67453ce66e566de2c86ba009830dd269be525 /include | |
| parent | b60a7726cc0f5cbb2aecdbba67aeaf54ffc2c9cf (diff) | |
| parent | 151623353f4a3da4daec29d658c10ef3b57bd462 (diff) | |
| download | qemu-70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e.zip qemu-70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e.tar.gz qemu-70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index cde0faf..22ef8ca 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -292,6 +292,9 @@ typedef struct GraphicHwOps { QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head, const GraphicHwOps *ops, void *opaque); +void graphic_console_set_hwops(QemuConsole *con, + const GraphicHwOps *hw_ops, + void *opaque); void graphic_hw_update(QemuConsole *con); void graphic_hw_invalidate(QemuConsole *con); |