Commit 3d27b09c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150427-1' into staging 



spice: misc fixes.

# gpg: Signature made Mon Apr 27 12:03:16 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20150427-1:
  spice: learn to hide cursor
  spice: set pointer position on hotspot
  spice: fix mouse cursor position
  spice: fix simple display on bigendian hosts
  monitor: Make client_migrate_info synchronous

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3f9d69ba 700cd855

hmp-commands.hx

+1 −2
Original line number Diff line number Diff line
@@ -998,8 +998,7 @@ ETEXI 
        .params     = "protocol hostname port tls-port cert-subject",

        .help       = "send migration info to spice/vnc client",

        .user_print = monitor_user_noop,

        .mhandler.cmd_async = client_migrate_info,

        .flags      = MONITOR_CMD_ASYNC,

        .mhandler.cmd_new = client_migrate_info,

    },



STEXI

include/ui/qemu-pixman.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
# define PIXMAN_BE_r8g8b8a8   PIXMAN_r8g8b8a8

# define PIXMAN_BE_x8b8g8r8   PIXMAN_x8b8g8r8

# define PIXMAN_BE_a8b8g8r8   PIXMAN_a8b8g8r8

# define PIXMAN_LE_x8r8g8b8   PIXMAN_b8g8r8x8

#else

# define PIXMAN_BE_r8g8b8     PIXMAN_b8g8r8

# define PIXMAN_BE_x8r8g8b8   PIXMAN_b8g8r8x8
@@ -45,6 +46,7 @@ 
# define PIXMAN_BE_r8g8b8a8   PIXMAN_a8b8g8r8

# define PIXMAN_BE_x8b8g8r8   PIXMAN_r8g8b8x8

# define PIXMAN_BE_a8b8g8r8   PIXMAN_r8g8b8a8

# define PIXMAN_LE_x8r8g8b8   PIXMAN_x8r8g8b8

#endif



/* -------------------------------------------------------------------- */

include/ui/qemu-spice.h

+2 −5
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ int qemu_spice_set_passwd(const char *passwd, 
                          bool fail_if_connected, bool disconnect_if_connected);

int qemu_spice_set_pw_expire(time_t expires);

int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,

                            const char *subject,

                            MonitorCompletion cb, void *opaque);

                            const char *subject);



CharDriverState *qemu_chr_open_spice_vmc(const char *type);

#if SPICE_SERVER_VERSION >= 0x000c02
@@ -70,10 +69,8 @@ static inline int qemu_spice_set_pw_expire(time_t expires) 
    return -1;

}

static inline int qemu_spice_migrate_info(const char *h, int p, int t,

                                          const char *s,

                                          MonitorCompletion cb, void *opaque)

                                          const char *s)

{

    cb(opaque, NULL);

    return -1;

}

include/ui/spice-display.h

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ struct SimpleSpiceDisplay { 
    /* cursor (without qxl): displaychangelistener -> spice server */

    SimpleSpiceCursor *ptr_define;

    SimpleSpiceCursor *ptr_move;

    uint16_t ptr_x, ptr_y;

    int16_t ptr_x, ptr_y;

    int16_t hot_x, hot_y;



    /* cursor (with qxl): qxl local renderer -> displaychangelistener */

    QEMUCursor *cursor;

monitor.c

+2 −3
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ static void hmp_info_trace_events(Monitor *mon, const QDict *qdict) 
}



static int client_migrate_info(Monitor *mon, const QDict *qdict,

                               MonitorCompletion cb, void *opaque)

                               QObject **ret_data)

{

    const char *protocol = qdict_get_str(qdict, "protocol");

    const char *hostname = qdict_get_str(qdict, "hostname");
@@ -1108,8 +1108,7 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, 
            return -1;

        }



        ret = qemu_spice_migrate_info(hostname, port, tls_port, subject,

                                      cb, opaque);

        ret = qemu_spice_migrate_info(hostname, port, tls_port, subject);

        if (ret != 0) {

            qerror_report(QERR_UNDEFINED_ERROR);

            return -1;