Commit 8a4c08b1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190222-pull-request' into staging 



ui: add support for -display spice-app
ui: gtk+sdl bugfixes.

# gpg: Signature made Fri 22 Feb 2019 07:53:13 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20190222-pull-request:
  display: add -display spice-app launching a Spice client
  spice: use a default name for the server
  qapi: document DisplayType enum
  build-sys: add gio-2.0 check
  char: register spice ports after spice started
  char: move SpiceChardev and open_spice_port() to spice.h header
  spice: do not stop spice if VM is paused
  spice: merge options lists
  spice: avoid spice runtime assert
  char/spice: discard write() if backend is disconnected
  char/spice: trigger HUP event
  ui/gtk: Fix the license information
  sdl2: drop qemu_input_event_send_key_qcode call
  spice: set device address and device display ID in QXL interface
  kbd-state: don't block auto-repeat events

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8eb29f1b d8aec9d9

chardev/spice.c

+36 −24
Original line number Diff line number Diff line
@@ -2,30 +2,12 @@ 
#include "trace.h"

#include "ui/qemu-spice.h"

#include "chardev/char.h"

#include "chardev/spice.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/option.h"

#include <spice.h>

#include <spice/protocol.h>





typedef struct SpiceChardev {

    Chardev               parent;



    SpiceCharDeviceInstance sin;

    bool                  active;

    bool                  blocked;

    const uint8_t         *datapos;

    int                   datalen;

    QLIST_ENTRY(SpiceChardev) next;

} SpiceChardev;



#define TYPE_CHARDEV_SPICE "chardev-spice"

#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"

#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport"



#define SPICE_CHARDEV(obj) OBJECT_CHECK(SpiceChardev, (obj), TYPE_CHARDEV_SPICE)



typedef struct SpiceCharSource {

    GSource               source;

    SpiceChardev       *scd;
@@ -148,15 +130,25 @@ static void vmc_unregister_interface(SpiceChardev *scd) 
static gboolean spice_char_source_prepare(GSource *source, gint *timeout)

{

    SpiceCharSource *src = (SpiceCharSource *)source;

    Chardev *chr = CHARDEV(src->scd);



    *timeout = -1;



    if (!chr->be_open) {

        return true;

    }



    return !src->scd->blocked;

}



static gboolean spice_char_source_check(GSource *source)

{

    SpiceCharSource *src = (SpiceCharSource *)source;

    Chardev *chr = CHARDEV(src->scd);



    if (!chr->be_open) {

        return true;

    }



    return !src->scd->blocked;

}
@@ -164,9 +156,12 @@ static gboolean spice_char_source_check(GSource *source) 
static gboolean spice_char_source_dispatch(GSource *source,

    GSourceFunc callback, gpointer user_data)

{

    SpiceCharSource *src = (SpiceCharSource *)source;

    Chardev *chr = CHARDEV(src->scd);

    GIOFunc func = (GIOFunc)callback;

    GIOCondition cond = chr->be_open ? G_IO_OUT : G_IO_HUP;



    return func(NULL, G_IO_OUT, user_data);

    return func(NULL, cond, user_data);

}



static GSourceFuncs SpiceCharSourceFuncs = {
@@ -195,6 +190,12 @@ static int spice_chr_write(Chardev *chr, const uint8_t *buf, int len) 
    int read_bytes;



    assert(s->datalen == 0);



    if (!chr->be_open) {

        trace_spice_chr_discard_write(len);

        return len;

    }



    s->datapos = buf;

    s->datalen = len;

    spice_server_char_device_wakeup(&s->sin);
@@ -287,10 +288,16 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, 
    }



    *be_opened = false;

#if SPICE_SERVER_VERSION < 0x000e02

    /* Spice < 0.14.2 doesn't explicitly open smartcard chardev */

    if (strcmp(type, "smartcard") == 0) {

        *be_opened = true;

    }

#endif

    chr_open(chr, type);

}



static void qemu_chr_open_spice_port(Chardev *chr,

void qemu_chr_open_spice_port(Chardev *chr,

                              ChardevBackend *backend,

                              bool *be_opened,

                              Error **errp)
@@ -309,6 +316,11 @@ static void qemu_chr_open_spice_port(Chardev *chr, 
    *be_opened = false;

    s = SPICE_CHARDEV(chr);

    s->sin.portname = g_strdup(name);



    if (using_spice) {

        /* spice server already created */

        vmc_register_interface(s);

    }

}



void qemu_spice_register_ports(void)

chardev/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ wct_cmd_other(const char *cmd) "%s" 
wct_speed(int speed) "%d"



# chardev/spice.c

spice_chr_discard_write(int len) "spice chr write discarded %d"

spice_vmc_write(ssize_t out, int len) "spice wrote %zd of requested %d"

spice_vmc_read(int bytes, int len) "spice read %d of requested %d"

spice_vmc_register_interface(void *scd) "spice vmc registered interface %p"

configure

+13 −0
Original line number Diff line number Diff line
@@ -3503,6 +3503,14 @@ for i in $glib_modules; do 
    fi

done



if $pkg_config --atleast-version=$glib_req_ver gio-2.0; then

    gio=yes

    gio_cflags=$($pkg_config --cflags gio-2.0)

    gio_libs=$($pkg_config --libs gio-2.0)

else

    gio=no

fi



# Sanity check that the current size_t matches the

# size that glib thinks it should be. This catches

# problems on multi-arch where people try to build
@@ -6520,6 +6528,11 @@ if test "$gtk" = "yes" ; then 
    echo "CONFIG_GTK_GL=y" >> $config_host_mak

  fi

fi

if test "$gio" = "yes" ; then

    echo "CONFIG_GIO=y" >> $config_host_mak

    echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak

    echo "GIO_LIBS=$gio_libs" >> $config_host_mak

fi

echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak

if test "$gnutls" = "yes" ; then

  echo "CONFIG_GNUTLS=y" >> $config_host_mak

hw/display/qxl.c

+13 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) 
                    QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,

                    0));

    } else {

#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */

/* >= release 0.12.6, < release 0.14.2 */

#if SPICE_SERVER_VERSION >= 0x000c06 && SPICE_SERVER_VERSION < 0x000e02

        if (qxl->max_outputs) {

            spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs);

        }
@@ -2188,6 +2189,17 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) 
                   SPICE_INTERFACE_QXL_MAJOR, SPICE_INTERFACE_QXL_MINOR);

        return;

    }



#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */

    char device_address[256] = "";

    if (qemu_spice_fill_device_address(qxl->vga.con, device_address, 256)) {

        spice_qxl_set_device_info(&qxl->ssd.qxl,

                                  device_address,

                                  0,

                                  qxl->max_outputs);

    }

#endif



    qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl);



    qxl->update_irq = qemu_bh_new(qxl_update_irq_bh, qxl);

include/chardev/spice.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef CHARDEV_SPICE_H_

#define CHARDEV_SPICE_H_



#include <spice.h>

#include "chardev/char-fe.h"



typedef struct SpiceChardev {

    Chardev               parent;



    SpiceCharDeviceInstance sin;

    bool                  active;

    bool                  blocked;

    const uint8_t         *datapos;

    int                   datalen;

    QLIST_ENTRY(SpiceChardev) next;

} SpiceChardev;



#define TYPE_CHARDEV_SPICE "chardev-spice"

#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"

#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport"



#define SPICE_CHARDEV(obj) OBJECT_CHECK(SpiceChardev, (obj), TYPE_CHARDEV_SPICE)



void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend,

                              bool *be_opened, Error **errp);



#endif