diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 10:17:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 10:17:49 +0100 |
| commit | ba7c388963e099c0d2cedb7f048e30747ffff25d (patch) | |
| tree | 0740800947805e1441b9f36953d3300afdcb47ee /hw/display | |
| parent | ce0274f730eacbd24c706523ddbbabb6b95d0659 (diff) | |
| parent | f7a8beb5e6a13dc924895244777d9ef08b23b367 (diff) | |
| download | qemu-ba7c388963e099c0d2cedb7f048e30747ffff25d.zip qemu-ba7c388963e099c0d2cedb7f048e30747ffff25d.tar.gz qemu-ba7c388963e099c0d2cedb7f048e30747ffff25d.tar.bz2 | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150529-1' into staging
spice: misc fixes.
# gpg: Signature made Fri May 29 09:16:29 2015 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-20150529-1:
spice: fix spice_chr_add_watch() pre-condition
spice: don't update mm_time when spice-server is stopped.
spice-char: notify the server when chardev is writable
virtio-console: notify chardev when writable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 8f40dfb..b220e2d 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -504,6 +504,10 @@ static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time) { PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl); + if (!qemu_spice_display_is_running(&qxl->ssd)) { + return; + } + trace_qxl_interface_set_mm_time(qxl->id, mm_time); qxl->shadow_rom.mm_clock = cpu_to_le32(mm_time); qxl->rom->mm_clock = cpu_to_le32(mm_time); |