Message ID | 1329317130-18859-1-git-send-email-kraxel@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, Feb 15, 2012 at 03:45:30PM +0100, Gerd Hoffmann wrote: > This patch fixes the local qxl renderer to not kick spice-server > in case the vm is stopped. First it is largely pointless because > we ask spice-server to process all not-yet processed commands when > the vm is stopped, so there isn't much do do anyway. Second we > avoid triggering an assert in spice-server. > > The patch makes sure we still honor redraw requests, even if we don't > ask spice-server for updates. This is needed to handle displaysurface > changes with a stopped vm correctly. > > With this patch applied it is possible to take screen shots (via > screendump monitor command) from a qxl gpu even in case the guest > is stopped. > ACK. > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/qxl-render.c | 12 +++++------- > 1 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/hw/qxl-render.c b/hw/qxl-render.c > index 133d093..7084143 100644 > --- a/hw/qxl-render.c > +++ b/hw/qxl-render.c > @@ -121,19 +121,17 @@ void qxl_render_update(PCIQXLDevice *qxl) > dpy_resize(vga->ds); > } > > - if (!qxl->guest_primary.commands) { > - return; > - } > - qxl->guest_primary.commands = 0; > - > update.left = 0; > update.right = qxl->guest_primary.surface.width; > update.top = 0; > update.bottom = qxl->guest_primary.surface.height; > > memset(dirty, 0, sizeof(dirty)); > - qxl_spice_update_area(qxl, 0, &update, > - dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); > + if (runstate_is_running() && qxl->guest_primary.commands) { > + qxl->guest_primary.commands = 0; > + qxl_spice_update_area(qxl, 0, &update, > + dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); > + } > if (redraw) { > memset(dirty, 0, sizeof(dirty)); > dirty[0] = update; > -- > 1.7.1 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel
On Wed, Feb 15, 2012 at 06:28:53PM +0200, Alon Levy wrote: > On Wed, Feb 15, 2012 at 03:45:30PM +0100, Gerd Hoffmann wrote: > > This patch fixes the local qxl renderer to not kick spice-server > > in case the vm is stopped. First it is largely pointless because > > we ask spice-server to process all not-yet processed commands when > > the vm is stopped, so there isn't much do do anyway. Second we > > avoid triggering an assert in spice-server. > > > > The patch makes sure we still honor redraw requests, even if we don't > > ask spice-server for updates. This is needed to handle displaysurface > > changes with a stopped vm correctly. > > > > With this patch applied it is possible to take screen shots (via > > screendump monitor command) from a qxl gpu even in case the guest > > is stopped. > > > > ACK. But please mention RHBZ 748810. > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > hw/qxl-render.c | 12 +++++------- > > 1 files changed, 5 insertions(+), 7 deletions(-) > > > > diff --git a/hw/qxl-render.c b/hw/qxl-render.c > > index 133d093..7084143 100644 > > --- a/hw/qxl-render.c > > +++ b/hw/qxl-render.c > > @@ -121,19 +121,17 @@ void qxl_render_update(PCIQXLDevice *qxl) > > dpy_resize(vga->ds); > > } > > > > - if (!qxl->guest_primary.commands) { > > - return; > > - } > > - qxl->guest_primary.commands = 0; > > - > > update.left = 0; > > update.right = qxl->guest_primary.surface.width; > > update.top = 0; > > update.bottom = qxl->guest_primary.surface.height; > > > > memset(dirty, 0, sizeof(dirty)); > > - qxl_spice_update_area(qxl, 0, &update, > > - dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); > > + if (runstate_is_running() && qxl->guest_primary.commands) { > > + qxl->guest_primary.commands = 0; > > + qxl_spice_update_area(qxl, 0, &update, > > + dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); > > + } > > if (redraw) { > > memset(dirty, 0, sizeof(dirty)); > > dirty[0] = update; > > -- > > 1.7.1 > > > > _______________________________________________ > > Spice-devel mailing list > > Spice-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/spice-devel > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel
diff --git a/hw/qxl-render.c b/hw/qxl-render.c index 133d093..7084143 100644 --- a/hw/qxl-render.c +++ b/hw/qxl-render.c @@ -121,19 +121,17 @@ void qxl_render_update(PCIQXLDevice *qxl) dpy_resize(vga->ds); } - if (!qxl->guest_primary.commands) { - return; - } - qxl->guest_primary.commands = 0; - update.left = 0; update.right = qxl->guest_primary.surface.width; update.top = 0; update.bottom = qxl->guest_primary.surface.height; memset(dirty, 0, sizeof(dirty)); - qxl_spice_update_area(qxl, 0, &update, - dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); + if (runstate_is_running() && qxl->guest_primary.commands) { + qxl->guest_primary.commands = 0; + qxl_spice_update_area(qxl, 0, &update, + dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC); + } if (redraw) { memset(dirty, 0, sizeof(dirty)); dirty[0] = update;
This patch fixes the local qxl renderer to not kick spice-server in case the vm is stopped. First it is largely pointless because we ask spice-server to process all not-yet processed commands when the vm is stopped, so there isn't much do do anyway. Second we avoid triggering an assert in spice-server. The patch makes sure we still honor redraw requests, even if we don't ask spice-server for updates. This is needed to handle displaysurface changes with a stopped vm correctly. With this patch applied it is possible to take screen shots (via screendump monitor command) from a qxl gpu even in case the guest is stopped. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/qxl-render.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)