Skip to content

Commit

Permalink
spice: don't update mm_time when spice-server is stopped.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kraxel committed May 29, 2015
1 parent e95e203 commit 641381c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions hw/display/qxl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions ui/spice-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 641381c

Please sign in to comment.