Commit 5a9259a0 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

spice: ui_info tweaks 



Use the new dpy_ui_info_supported function.
Clarifies the control flow.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent c6e48470

ui/spice-display.c

+8 −9
Original line number Diff line number Diff line
@@ -661,7 +661,10 @@ static int interface_client_monitors_config(QXLInstance *sin, 
{

    SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);

    QemuUIInfo info;

    int rc;



    if (!dpy_ui_info_supported(ssd->dcl.con)) {

        return 0; /* == not supported by guest */

    }



    if (!mc) {

        return 1;
@@ -676,15 +679,11 @@ static int interface_client_monitors_config(QXLInstance *sin, 
        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 {

    dpy_set_ui_info(ssd->dcl.con, &info);

    dprint(1, "%s/%d: size %dx%d\n", __func__, ssd->qxl.id,

           info.width, info.height);

    return 1;

}

}



static const QXLInterface dpy_interface = {

    .base.type               = SPICE_INTERFACE_QXL,