> > @@ -413,8 +392,10 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,
> >          surface_height(surface) == pixman_image_get_height(ssd->surface) &&
> >          surface_format(surface) == pixman_image_get_format(ssd->surface)) {
> >          /* no-resize fast path: just swap backing store */
> > -        dprint(1, "%s/%d: fast (%dx%d)\n", __func__, ssd->qxl.id,
> > -               surface_width(surface), surface_height(surface));
> > +        trace_qemu_spice_display_surface(ssd->qxl.id,
> > +                                         surface_width(surface),
> > +                                         surface_height(surface),
> > +                                         true);
> >          qemu_mutex_lock(&ssd->lock);
> >          ssd->ds = surface;
> >          pixman_image_unref(ssd->surface);
> > @@ -427,11 +408,10 @@ void qemu_spice_display_switch(SimpleSpiceDisplay 
> > *ssd,
> >      }
> >
> >      /* full mode switch */
> > -    dprint(1, "%s/%d: full (%dx%d -> %dx%d)\n", __func__, ssd->qxl.id,
> > -           ssd->surface ? pixman_image_get_width(ssd->surface)  : 0,
> > -           ssd->surface ? pixman_image_get_height(ssd->surface) : 0,
> > -           surface ? surface_width(surface)  : 0,
> > -           surface ? surface_height(surface) : 0);
> > +    trace_qemu_spice_display_surface(ssd->qxl.id,
> > +                                     surface_width(surface),
> > +                                     surface_height(surface),
> > +                                     false);
> 
> You are now assuming surface is always != NULL, but
> dpy_gfx_replace_surface() for example, has assert( || surface == NULL)
> before calling dpy_gfx_switch().

Oops.  Wasn't intentional (cut & paste from above).  Will fix.

cheers,
  Gerd


Reply via email to