[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped |
Date: |
Fri, 2 Nov 2012 10:35:14 +0100 |
From: Alon Levy <address@hidden>
Added a trace point for easy logging.
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=870972
Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 8 +++++++-
trace-events | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index cc16eaf..f19451b 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1701,7 +1701,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 066cdaf..33846bb 100644
--- a/trace-events
+++ b/trace-events
@@ -999,6 +999,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"
--
1.7.1
- [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 3/7] qxl: fix cursor reset, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/7] spice: switch to pixman, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 1/7] hw/qxl: guest bug on primary create with stride %4 != 0, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 7/7] spice: fix initialization order, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 4/7] qxl: call dpy_gfx_resize when entering vga mode, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 6/7] pflib: unused, remove it., Gerd Hoffmann, 2012/11/02
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/05
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Anthony Liguori, 2012/11/14