| Message ID | 1310670801-14687-11-git-send-email-alevy@redhat.com |
|---|---|
| State | New |
| Headers | show |
> +#if SPICE_INTERFACE_QXL_MINOR>= 1 > + case QXL_IO_FLUSH_RELEASE: { > + QXLReleaseRing *ring =&d->ram->release_ring; > + if (ring->prod - ring->cons + 1 == ring->num_items) { > + fprintf(stderr, > + "ERROR: no flush, full release ring [p%d,%dc]\n", > + ring->prod, ring->cons); > + } > + qxl_push_free_res(d, 1 /* flush */); > + dprint(d, 1, "QXL_IO_FLUSH_RELEASE exit (%s, s#=%d, res#=%d,%p)\n", > + qxl_mode_to_string(d->mode), d->guest_surfaces.count, > + d->num_free_res, d->last_release); > + break; > + } > + case QXL_IO_FLUSH_SURFACES_ASYNC: > + dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n", > + val, qxl_mode_to_string(d->mode), d->guest_surfaces.count, > + d->num_free_res); > + qxl_spice_flush_surfaces_async(d); > +#endif > + break; The last two lines should be swapped I guess. Doesn't harm, but looks a bit odd ... cheers, Gerd
On Fri, Jul 15, 2011 at 10:15:26AM +0200, Gerd Hoffmann wrote: > >+#if SPICE_INTERFACE_QXL_MINOR>= 1 > >+ case QXL_IO_FLUSH_RELEASE: { > >+ QXLReleaseRing *ring =&d->ram->release_ring; > >+ if (ring->prod - ring->cons + 1 == ring->num_items) { > >+ fprintf(stderr, > >+ "ERROR: no flush, full release ring [p%d,%dc]\n", > >+ ring->prod, ring->cons); > >+ } > >+ qxl_push_free_res(d, 1 /* flush */); > >+ dprint(d, 1, "QXL_IO_FLUSH_RELEASE exit (%s, s#=%d, res#=%d,%p)\n", > >+ qxl_mode_to_string(d->mode), d->guest_surfaces.count, > >+ d->num_free_res, d->last_release); > >+ break; > >+ } > >+ case QXL_IO_FLUSH_SURFACES_ASYNC: > >+ dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n", > >+ val, qxl_mode_to_string(d->mode), d->guest_surfaces.count, > >+ d->num_free_res); > >+ qxl_spice_flush_surfaces_async(d); > >+#endif > >+ break; > > The last two lines should be swapped I guess. > Doesn't harm, but looks a bit odd ... yep. thanks, will fix. > > cheers, > Gerd >
diff --git a/hw/qxl.c b/hw/qxl.c index 6f784e6..77f9ec4 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -185,6 +185,13 @@ static void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id, } } +#if SPICE_INTERFACE_QXL_MINOR >= 1 +static void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl) +{ + qxl->ssd.worker->flush_surfaces_async(qxl->ssd.worker, 0); +} +#endif + void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext, uint32_t count) { @@ -1210,6 +1217,8 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) goto async_common; case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: io_port = QXL_IO_DESTROY_ALL_SURFACES; + goto async_common; + case QXL_IO_FLUSH_SURFACES_ASYNC: async_common: async = QXL_ASYNC; qemu_mutex_lock(&d->async_lock); @@ -1326,6 +1335,27 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) } qxl_spice_destroy_surface_wait(d, val, async); break; +#if SPICE_INTERFACE_QXL_MINOR >= 1 + case QXL_IO_FLUSH_RELEASE: { + QXLReleaseRing *ring = &d->ram->release_ring; + if (ring->prod - ring->cons + 1 == ring->num_items) { + fprintf(stderr, + "ERROR: no flush, full release ring [p%d,%dc]\n", + ring->prod, ring->cons); + } + qxl_push_free_res(d, 1 /* flush */); + dprint(d, 1, "QXL_IO_FLUSH_RELEASE exit (%s, s#=%d, res#=%d,%p)\n", + qxl_mode_to_string(d->mode), d->guest_surfaces.count, + d->num_free_res, d->last_release); + break; + } + case QXL_IO_FLUSH_SURFACES_ASYNC: + dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n", + val, qxl_mode_to_string(d->mode), d->guest_surfaces.count, + d->num_free_res); + qxl_spice_flush_surfaces_async(d); +#endif + break; case QXL_IO_DESTROY_ALL_SURFACES: d->mode = QXL_MODE_UNDEFINED; qxl_spice_destroy_surfaces(d, async);
Add two new IOs. QXL_IO_FLUSH_SURFACES - equivalent to update area for all surfaces, used to reduce vmexits from NumSurfaces to 1 on guest S3, S4 and resolution change (windows driver implementation is such that this is done on each of those occasions). QXL_IO_FLUSH_RELEASE - used to ensure anything on last_release is put on the release ring for the client to free. Cc: Yonit Halperin <yhalperi@redhat.com> Signed-off-by: Alon Levy <alevy@redhat.com> --- hw/qxl.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)