Patchwork hw/qxl: qxl_send_events: nop if stopped

login
register
mail settings
Submitter Alon Levy
Date Nov. 1, 2012, 12:56 p.m.
Message ID <1351774560-20800-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/196188/
State New
Headers show

Comments

Alon Levy - Nov. 1, 2012, 12:56 p.m.
Added a trace point for easy logging.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=870972

Signed-off-by: Alon Levy <alevy@redhat.com>
---
 hw/qxl.c     | 8 +++++++-
 trace-events | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)
Gerd Hoffmann - Nov. 1, 2012, 1:08 p.m.
On 11/01/12 13:56, Alon Levy wrote:
> Added a trace point for easy logging.

Patch added to spice patch queue.

thanks,
  Gerd

PS: There are two pending patches from you
    (see http://www.kraxel.org/cgit/qemu/log/?h=rebase/spice-next),
    is that correct or did I miss something?

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 7b88a1e..c33dd03 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1739,7 +1739,13 @@  static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
     uint32_t le_events = cpu_to_le32(events);
 
     trace_qxl_send_events(d->id, events);
-    assert(qemu_spice_display_is_running(&d->ssd));
+    if (!qemu_spice_display_is_running(&d->ssd)) {
+        /* spice-server tracks guest running state and should not do this */
+        fprintf(stderr, "%s: spice-server bug: guest stopped, ignoring\n",
+                __func__);
+        trace_qxl_send_events_vm_stopped(d->id, events);
+        return;
+    }
     old_pending = __sync_fetch_and_or(&d->ram->int_pending, le_events);
     if ((old_pending & le_events) == le_events) {
         return;
diff --git a/trace-events b/trace-events
index 7ee21e5..d308533 100644
--- a/trace-events
+++ b/trace-events
@@ -994,6 +994,7 @@  qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t righ
 qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d"
 qxl_surfaces_dirty(int qid, int surface, int offset, int size) "%d surface=%d offset=%d size=%d"
 qxl_send_events(int qid, uint32_t events) "%d %d"
+qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d"
 qxl_set_guest_bug(int qid) "%d"
 qxl_interrupt_client_monitors_config(int qid, int num_heads, void *heads) "%d %d %p"
 qxl_client_monitors_config_unsupported_by_guest(int qid, uint32_t int_mask, void *client_monitors_config) "%d %X %p"