Commit adeecf14 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



spice: fix coverity defect, add unix address support

# gpg: Signature made Thu 22 Jan 2015 11:17:24 GMT 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-20150122-1:
  spice: fix coverity reported defect in display code
  spice: add unix address support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3a4755a 51a09099

qemu-options.hx

+2 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, 
    "-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n"

    "       [,x509-key-file=<file>][,x509-key-password=<file>]\n"

    "       [,x509-cert-file=<file>][,x509-cacert-file=<file>]\n"

    "       [,x509-dh-key-file=<file>][,addr=addr][,ipv4|ipv6]\n"

    "       [,x509-dh-key-file=<file>][,addr=addr][,ipv4|ipv6|unix]\n"

    "       [,tls-ciphers=<list>]\n"

    "       [,tls-channel=[main|display|cursor|inputs|record|playback]]\n"

    "       [,plaintext-channel=[main|display|cursor|inputs|record|playback]]\n"
@@ -982,6 +982,7 @@ Set the IP address spice is listening on. Default is any address. 


@item ipv4

@item ipv6

@item unix

Force using the specified IP version.



@item password=<secret>

ui/spice-core.c

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

            .name = "ipv6",

            .type = QEMU_OPT_BOOL,

#ifdef SPICE_ADDR_FLAG_UNIX_ONLY

        },{

            .name = "unix",

            .type = QEMU_OPT_BOOL,

#endif

        },{

            .name = "password",

            .type = QEMU_OPT_STRING,
@@ -708,6 +713,10 @@ void qemu_spice_init(void) 
        addr_flags |= SPICE_ADDR_FLAG_IPV4_ONLY;

    } else if (qemu_opt_get_bool(opts, "ipv6", 0)) {

        addr_flags |= SPICE_ADDR_FLAG_IPV6_ONLY;

#ifdef SPICE_ADDR_FLAG_UNIX_ONLY

    } else if (qemu_opt_get_bool(opts, "unix", 0)) {

        addr_flags |= SPICE_ADDR_FLAG_UNIX_ONLY;

#endif

    }



    spice_server = spice_server_new();

ui/spice-display.c

+3 −3
Original line number Diff line number Diff line
@@ -438,9 +438,6 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, 
    qemu_mutex_lock(&ssd->lock);

    need_destroy = (ssd->ds != NULL);

    ssd->ds = surface;

    ssd->surface = pixman_image_ref(ssd->ds->image);

    ssd->mirror  = qemu_pixman_mirror_create(ssd->ds->format,

                                             ssd->ds->image);

    while ((update = QTAILQ_FIRST(&ssd->updates)) != NULL) {

        QTAILQ_REMOVE(&ssd->updates, update, next);

        qemu_spice_destroy_update(ssd, update);
@@ -450,6 +447,9 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, 
        qemu_spice_destroy_host_primary(ssd);

    }

    if (ssd->ds) {

        ssd->surface = pixman_image_ref(ssd->ds->image);

        ssd->mirror  = qemu_pixman_mirror_create(ssd->ds->format,

                                                 ssd->ds->image);

        qemu_spice_create_host_primary(ssd);

    }