diff options
| author |   Alon Levy <alevy@redhat.com> | 2012-11-01 14:56:00 +0200 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@cardoe.com> | 2013-01-12 20:39:15 -0600 |
| commit | c57b5f0f8ed4130c2debd1d72dd273db05ae4194 (patch) | |
| tree | 9a203c664fdf8a6bf47a8e3220865dc04b393532 | |
| parent | dtrace backend: add function to reserved words (diff) | |
| download | qemu-kvm-c57b5f0f8ed4130c2debd1d72dd273db05ae4194.tar.gz qemu-kvm-c57b5f0f8ed4130c2debd1d72dd273db05ae4194.tar.bz2 qemu-kvm-c57b5f0f8ed4130c2debd1d72dd273db05ae4194.zip | |
hw/qxl: qxl_send_events: nop if stopped
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>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 511aefb0c60e3063ead76d4ba6aabf619eed18ef)
| -rw-r--r-- | hw/qxl.c | 8 | ||||
| -rw-r--r-- | trace-events | 1 |
2 files changed, 8 insertions, 1 deletions
@@ -1614,7 +1614,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 aa7983635..912233c8f 100644 --- a/trace-events +++ b/trace-events @@ -972,6 +972,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" # hw/qxl-render.c |