From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUDey-0006SR-SR for qemu-devel@nongnu.org; Fri, 02 Nov 2012 05:35:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUDet-0002ls-6v for qemu-devel@nongnu.org; Fri, 02 Nov 2012 05:35:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUDes-0002lb-Uh for qemu-devel@nongnu.org; Fri, 02 Nov 2012 05:35:23 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA29ZLk8030650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 Nov 2012 05:35:21 -0400 From: Gerd Hoffmann Date: Fri, 2 Nov 2012 10:35:14 +0100 Message-Id: <1351848919-10388-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1351848919-10388-1-git-send-email-kraxel@redhat.com> References: <1351848919-10388-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alon Levy , Gerd Hoffmann From: Alon Levy Added a trace point for easy logging. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=870972 Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- 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