Commit 9fbbf0d1 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'spice/spice.v71' into staging 



# By Gerd Hoffmann (1) and Hans de Goede (1)
# Via Gerd Hoffmann
* spice/spice.v71:
  spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)
  qxl: fix Coverity scan SIGN_EXTENSION error

Message-id: 1372060666-18182-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 89f204d2 5ad24e5f

hw/display/qxl-render.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor) 
    c->hot_y = cursor->header.hot_spot_y;

    switch (cursor->header.type) {

    case SPICE_CURSOR_TYPE_ALPHA:

        size = cursor->header.width * cursor->header.height * sizeof(uint32_t);

        size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;

        memcpy(c->data, cursor->chunk.data, size);

        if (qxl->debug > 2) {

            cursor_print_ascii_art(c, "qxl/alpha");

qemu-options.hx

+5 −2
Original line number Diff line number Diff line
@@ -917,8 +917,8 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, 
    "       [,jpeg-wan-compression=[auto|never|always]]\n"

    "       [,zlib-glz-wan-compression=[auto|never|always]]\n"

    "       [,streaming-video=[off|all|filter]][,disable-copy-paste]\n"

    "       [,agent-mouse=[on|off]][,playback-compression=[on|off]]\n"

    "       [,seamless-migration=[on|off]]\n"

    "       [,disable-agent-file-xfer][,agent-mouse=[on|off]]\n"

    "       [,playback-compression=[on|off]][,seamless-migration=[on|off]]\n"

    "   enable spice\n"

    "   at least one of {port, tls-port} is mandatory\n",

    QEMU_ARCH_ALL)
@@ -961,6 +961,9 @@ Allow client connects without authentication. 
@item disable-copy-paste

Disable copy paste between the client and the guest.



@item disable-agent-file-xfer

Disable spice-vdagent based file-xfer between the client and the guest.



@item tls-port=<nr>

Set the TCP port spice is listening on for encrypted channels.

ui/spice-core.c

+13 −0
Original line number Diff line number Diff line
@@ -445,6 +445,9 @@ static QemuOptsList qemu_spice_opts = { 
        },{

            .name = "disable-copy-paste",

            .type = QEMU_OPT_BOOL,

        },{

            .name = "disable-agent-file-xfer",

            .type = QEMU_OPT_BOOL,

        },{

            .name = "sasl",

            .type = QEMU_OPT_BOOL,
@@ -739,6 +742,16 @@ void qemu_spice_init(void) 
        spice_server_set_agent_copypaste(spice_server, false);

    }



    if (qemu_opt_get_bool(opts, "disable-agent-file-xfer", 0)) {

#if SPICE_SERVER_VERSION >= 0x000c04

        spice_server_set_agent_file_xfer(spice_server, false);

#else

        error_report("this qemu build does not support the "

                     "\"disable-agent-file-xfer\" option");

        exit(1);

#endif

    }



    compression = SPICE_IMAGE_COMPRESS_AUTO_GLZ;

    str = qemu_opt_get(opts, "image-compression");

    if (str) {