|
 |
9290838 |
From 46afee90f84ed7f03a6c1e086cb7a3894451682d Mon Sep 17 00:00:00 2001
|
|
 |
83889a9 |
From: Alon Levy <alevy@redhat.com>
|
|
|
83889a9 |
Date: Thu, 1 Nov 2012 14:56:00 +0200
|
|
|
9290838 |
Subject: [PATCH] hw/qxl: qxl_send_events: nop if stopped
|
|
|
83889a9 |
|
|
|
83889a9 |
Added a trace point for easy logging.
|
|
|
83889a9 |
|
|
|
83889a9 |
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=870972
|
|
|
83889a9 |
|
|
|
83889a9 |
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
|
83889a9 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
83889a9 |
---
|
|
|
83889a9 |
hw/qxl.c | 8 +++++++-
|
|
|
83889a9 |
trace-events | 1 +
|
|
|
83889a9 |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
83889a9 |
|
|
|
83889a9 |
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
|
83889a9 |
index 445705e..8111bb9 100644
|
|
|
83889a9 |
--- a/hw/qxl.c
|
|
|
83889a9 |
+++ b/hw/qxl.c
|
|
|
83889a9 |
@@ -1714,7 +1714,13 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
|
|
|
83889a9 |
uint32_t le_events = cpu_to_le32(events);
|
|
|
83889a9 |
|
|
|
83889a9 |
trace_qxl_send_events(d->id, events);
|
|
|
83889a9 |
- assert(qemu_spice_display_is_running(&d->ssd));
|
|
|
83889a9 |
+ if (!qemu_spice_display_is_running(&d->ssd)) {
|
|
|
83889a9 |
+ /* spice-server tracks guest running state and should not do this */
|
|
|
83889a9 |
+ fprintf(stderr, "%s: spice-server bug: guest stopped, ignoring\n",
|
|
|
83889a9 |
+ __func__);
|
|
|
83889a9 |
+ trace_qxl_send_events_vm_stopped(d->id, events);
|
|
|
83889a9 |
+ return;
|
|
|
83889a9 |
+ }
|
|
|
83889a9 |
old_pending = __sync_fetch_and_or(&d->ram->int_pending, le_events);
|
|
|
83889a9 |
if ((old_pending & le_events) == le_events) {
|
|
|
83889a9 |
return;
|
|
|
83889a9 |
diff --git a/trace-events b/trace-events
|
|
|
9290838 |
index 07b63f1..992aef1 100644
|
|
|
83889a9 |
--- a/trace-events
|
|
|
83889a9 |
+++ b/trace-events
|
|
|
9290838 |
@@ -973,6 +973,7 @@ qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t righ
|
|
|
83889a9 |
qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d"
|
|
|
83889a9 |
qxl_surfaces_dirty(int qid, int surface, int offset, int size) "%d surface=%d offset=%d size=%d"
|
|
|
83889a9 |
qxl_send_events(int qid, uint32_t events) "%d %d"
|
|
|
83889a9 |
+qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d"
|
|
|
83889a9 |
qxl_set_guest_bug(int qid) "%d"
|
|
|
83889a9 |
qxl_interrupt_client_monitors_config(int qid, int num_heads, void *heads) "%d %d %p"
|
|
|
83889a9 |
qxl_client_monitors_config_unsupported_by_guest(int qid, uint32_t int_mask, void *client_monitors_config) "%d %X %p"
|