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 /ui | |
| parent | b60a7726cc0f5cbb2aecdbba67aeaf54ffc2c9cf (diff) | |
| parent | 151623353f4a3da4daec29d658c10ef3b57bd462 (diff) | |
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 'ui')
| -rw-r--r-- | ui/console.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ui/console.c b/ui/console.c index f819382b24..258af5dfff 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1677,6 +1677,14 @@ DisplayState *init_displaystate(void) return display_state; } +void graphic_console_set_hwops(QemuConsole *con, + const GraphicHwOps *hw_ops, + void *opaque) +{ + con->hw_ops = hw_ops; + con->hw = opaque; +} + QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head, const GraphicHwOps *hw_ops, void *opaque) @@ -1691,8 +1699,7 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head, ds = get_alloc_displaystate(); trace_console_gfx_new(); s = new_console(ds, GRAPHIC_CONSOLE, head); - s->hw_ops = hw_ops; - s->hw = opaque; + graphic_console_set_hwops(s, hw_ops, opaque); if (dev) { object_property_set_link(OBJECT(s), OBJECT(dev), "device", &error_abort); |