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 <yhalp...@redhat.com> Signed-off-by: Alon Levy <al...@redhat.com> --- hw/qxl.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 5ea4c76..ae70e3f 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -182,6 +182,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) { @@ -1183,6 +1190,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) case QXL_IO_DESTROY_PRIMARY_ASYNC: case QXL_IO_DESTROY_SURFACE_ASYNC: case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: + case QXL_IO_FLUSH_SURFACES_ASYNC: #if SPICE_INTERFACE_QXL_MINOR < 1 fprintf(stderr, "qxl: error: async not supported by libspice" "but guest driver used it\n"); @@ -1320,6 +1328,31 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) } qxl_spice_destroy_surface_wait(d, val, async); break; + 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: +#if SPICE_INTERFACE_QXL_MINOR >= 1 + 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); +#else + dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) ignored, " + "too old spice server\n", + val); +#endif + break; case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: case QXL_IO_DESTROY_ALL_SURFACES: d->mode = QXL_MODE_UNDEFINED; -- 1.7.6