Patchwork [RFC] hw/qxl: inject interrupts in any state

login
register
mail settings
Submitter Alon Levy
Date Nov. 1, 2012, 12:44 p.m.
Message ID <2016872320.25352175.1351773842819.JavaMail.root@redhat.com>
Download mbox | patch
Permalink /patch/196186/
State New
Headers show

Comments

Alon Levy - Nov. 1, 2012, 12:44 p.m.
> On 11/01/12 12:48, Alon Levy wrote:
> > +    if (!qemu_spice_display_is_running(&d->ssd)) {
> > +        fprintf(stderr, "%s: guest stopped, ignoring\n",
> > __func__);
> > +        trace_qxl_send_events_vm_stopped(d->id, events);
> > +        return;
> > +    }
> 
> Almost perfect.  We should add a note here that this happening is a
> spice server bug, at least as source code comment, maybe also in the
> fprintf.
> 
> cheers,
>   Gerd
> 


commit 49072da137e3d2d86449082e152b0717e5e94672
Author: Alon Levy <alevy@redhat.com>
Date:   Tue Oct 30 18:00:33 2012 +0200

    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>
Gerd Hoffmann - Nov. 1, 2012, 12:47 p.m.
On 11/01/12 13:44, Alon Levy wrote:
>> On 11/01/12 12:48, Alon Levy wrote:
>>> +    if (!qemu_spice_display_is_running(&d->ssd)) {
>>> +        fprintf(stderr, "%s: guest stopped, ignoring\n",
>>> __func__);
>>> +        trace_qxl_send_events_vm_stopped(d->id, events);
>>> +        return;
>>> +    }
>>
>> Almost perfect.  We should add a note here that this happening is a
>> spice server bug, at least as source code comment, maybe also in the
>> fprintf.
>>
>> cheers,
>>   Gerd
>>
> 
> 
> commit 49072da137e3d2d86449082e152b0717e5e94672
> Author: Alon Levy <alevy@redhat.com>
> Date:   Tue Oct 30 18:00:33 2012 +0200
> 
>     hw/qxl: qxl_send_events: nop if stopped

Now I need that in 'git send-email' format so I can 'git am' it.  Or
push to git://people.freedesktop.org/~alon/qemu so I can 'git
cherry-pick' from there.

thanks,
  Gerd

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"