From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 3/4] spice: don't update mm_time when spice-server is stopped.
Date: Fri, 29 May 2015 10:26:17 +0200 [thread overview]
Message-ID: <1432887978-7411-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1432887978-7411-1-git-send-email-kraxel@redhat.com>
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>
---
hw/display/qxl.c | 4 ++++
ui/spice-core.c | 1 +
2 files changed, 5 insertions(+)
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);
diff --git a/ui/spice-core.c b/ui/spice-core.c
index f00e074..2e8384e 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);
--
1.8.3.1
next prev parent reply other threads:[~2015-05-29 8:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 8:26 [Qemu-devel] [PULL 0/4] spice patch queue Gerd Hoffmann
2015-05-29 8:26 ` [Qemu-devel] [PULL 1/4] virtio-console: notify chardev when writable Gerd Hoffmann
2015-05-29 8:26 ` [Qemu-devel] [PULL 2/4] spice-char: notify the server when chardev is writable Gerd Hoffmann
2015-05-29 8:26 ` Gerd Hoffmann [this message]
2015-05-29 8:26 ` [Qemu-devel] [PULL 4/4] spice: fix spice_chr_add_watch() pre-condition Gerd Hoffmann
2015-05-29 10:22 ` [Qemu-devel] [PULL 0/4] spice patch queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432887978-7411-4-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).