From 4b87dc4c9729aaa77737d2f20c255231f4edb526 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 24 Jan 2014 10:48:58 +0100 Subject: [PATCH 1/3] spice: fix simple display surface handling Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index 9bb42f1461..2a1fbda7bc 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -354,6 +354,7 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, DisplaySurface *surface) { SimpleSpiceUpdate *update; + bool need_destroy; dprint(1, "%s/%d:\n", __func__, ssd->qxl.id); @@ -366,14 +367,19 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, } qemu_mutex_lock(&ssd->lock); + need_destroy = (ssd->ds != NULL); ssd->ds = surface; while ((update = QTAILQ_FIRST(&ssd->updates)) != NULL) { QTAILQ_REMOVE(&ssd->updates, update, next); qemu_spice_destroy_update(ssd, update); } qemu_mutex_unlock(&ssd->lock); - qemu_spice_destroy_host_primary(ssd); - qemu_spice_create_host_primary(ssd); + if (need_destroy) { + qemu_spice_destroy_host_primary(ssd); + } + if (ssd->ds) { + qemu_spice_create_host_primary(ssd); + } memset(&ssd->dirty, 0, sizeof(ssd->dirty)); ssd->notify++; @@ -610,8 +616,6 @@ static void qemu_spice_display_init_one(QemuConsole *con) ssd->dcl.ops = &display_listener_ops; ssd->dcl.con = con; register_displaychangelistener(&ssd->dcl); - - qemu_spice_create_host_primary(ssd); } void qemu_spice_display_init(void) From 9b74d0d598b022e558d06bf6d57f0f303d1a4bc8 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 24 Jan 2014 18:47:20 +0100 Subject: [PATCH 2/3] spice: QemuUIInfo windup Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index 2a1fbda7bc..e28698c6b6 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -543,10 +543,29 @@ static void interface_set_client_capabilities(QXLInstance *sin, } static int interface_client_monitors_config(QXLInstance *sin, - VDAgentMonitorsConfig *monitors_config) + VDAgentMonitorsConfig *mc) { - dprint(3, "%s:\n", __func__); - return 0; /* == not supported by guest */ + SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl); + QemuUIInfo info; + int rc; + + /* + * FIXME: multihead is tricky due to the way + * spice has multihead implemented. + */ + memset(&info, 0, sizeof(info)); + if (mc->num_of_monitors > 0) { + info.width = mc->monitors[0].width; + info.height = mc->monitors[0].height; + } + rc = dpy_set_ui_info(ssd->dcl.con, &info); + dprint(1, "%s/%d: size %dx%d, rc %d <--- ==========================\n", + __func__, ssd->qxl.id, info.width, info.height, rc); + if (rc != 0) { + return 0; /* == not supported by guest */ + } else { + return 1; + } } static const QXLInterface dpy_interface = { From c9dd4074df9b702090fa0e42c0101d75d44c7eb9 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 6 Mar 2014 18:13:33 +0100 Subject: [PATCH 3/3] configure: Prettify message for hosts without spice support Instead of spice support no (/) configure now prints spice support no Signed-off-by: Stefan Weil Signed-off-by: Gerd Hoffmann --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 8689435ccf..ff72ee3b21 100755 --- a/configure +++ b/configure @@ -4107,7 +4107,11 @@ echo "vhost-net support $vhost_net" echo "vhost-scsi support $vhost_scsi" echo "Trace backend $trace_backend" echo "Trace output file $trace_file-" +if test "$spice" = "yes"; then echo "spice support $spice ($spice_protocol_version/$spice_server_version)" +else +echo "spice support $spice" +fi echo "rbd support $rbd" echo "xfsctl support $xfs" echo "nss used $smartcard_nss"