diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-05-12 11:54:34 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-05-29 09:56:01 +0200 |
| commit | 641381c1fcd66ea8de07ecfcd733089da26cbba9 (patch) | |
| tree | fdea004f85ee6034b334e5dc30f65afa9c870f7e | |
| parent | e95e203c085b7731746e39c9b9f8bd2f6eaa0cd6 (diff) | |
| download | qemu-641381c1fcd66ea8de07ecfcd733089da26cbba9.tar.gz | |
spice: don't update mm_time when spice-server is stopped.
Skip mm_time updates (in qxl device memory) in case the guest is stopped.
Guest isn't able to look anyway, and it causes problems with migration.
Also make sure the initial state for spice server is stopped.
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/display/qxl.c | 4 | ||||
| -rw-r--r-- | ui/spice-core.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 8f40dfb8ac..b220e2d5d2 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); diff --git a/ui/spice-core.c b/ui/spice-core.c index f00e0742b4..2e8384e653 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -804,6 +804,7 @@ void qemu_spice_init(void) qemu_spice_audio_init(); qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); + qemu_spice_display_stop(); g_free(x509_key_file); g_free(x509_cert_file); |