Commit d985bd4d authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



# By Gerd Hoffmann (2) and Christophe Fergeau (1)
# Via Gerd Hoffmann
* spice/spice.v73:
  qxl: fix local renderer
  qxl: trace io port name
  spice-core: Use g_strdup_printf instead of snprintf

Message-id: 1378807572-27902-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents a640f07c c58c7b95

hw/display/qxl-render.c

+10 −5
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) 
    if (is_buffer_shared(surface)) {

        return;

    }

    if (!qxl->guest_primary.data) {

        trace_qxl_render_blit_guest_primary_initialized();

        qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);

    }

    trace_qxl_render_blit(qxl->guest_primary.qxl_stride,

            rect->left, rect->right, rect->top, rect->bottom);

    src = qxl->guest_primary.data;
@@ -104,7 +100,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) 


    if (qxl->guest_primary.resized) {

        qxl->guest_primary.resized = 0;

        qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);

        qxl->guest_primary.data = qxl_phys2virt(qxl,

                                                qxl->guest_primary.surface.mem,

                                                MEMSLOT_GROUP_GUEST);

        if (!qxl->guest_primary.data) {

            return;

        }

        qxl_set_rect_to_surface(qxl, &qxl->dirty[0]);

        qxl->num_dirty_rects = 1;

        trace_qxl_render_guest_primary_resized(
@@ -128,6 +129,10 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) 
        }

        dpy_gfx_replace_surface(vga->con, surface);

    }



    if (!qxl->guest_primary.data) {

        return;

    }

    for (i = 0; i < qxl->num_dirty_rects; i++) {

        if (qemu_spice_rect_is_empty(qxl->dirty+i)) {

            break;

hw/display/qxl.c

+3 −2
Original line number Diff line number Diff line
@@ -1541,8 +1541,9 @@ async_common: 
    default:

        break;

    }

    trace_qxl_io_write(d->id, qxl_mode_to_string(d->mode), addr, val, size,

                       async);

    trace_qxl_io_write(d->id, qxl_mode_to_string(d->mode),

                       addr, io_port_to_string(addr),

                       val, size, async);



    switch (io_port) {

    case QXL_IO_UPDATE_AREA:

trace-events

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ qxl_io_destroy_primary_ignored(int qid, const char *mode) "%d %s" 
qxl_io_log(int qid, const uint8_t *log_buf) "%d %s"

qxl_io_read_unexpected(int qid) "%d"

qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const char *desc) "%d 0x%"PRIx64"=%"PRIu64" (%s)"

qxl_io_write(int qid, const char *mode, uint64_t addr, uint64_t val, unsigned size, int async) "%d %s addr=%"PRIu64 " val=%"PRIu64" size=%u async=%d"

qxl_io_write(int qid, const char *mode, uint64_t addr, const char *aname, uint64_t val, unsigned size, int async) "%d %s addr=%"PRIu64 " (%s) val=%"PRIu64" size=%u async=%d"

qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uint64_t guest_end) "%d %u: guest phys 0x%"PRIx64 " - 0x%" PRIx64

qxl_post_load(int qid, const char *mode) "%d %s"

qxl_pre_load(int qid) "%d"

ui/spice-core.c

+14 −14
Original line number Diff line number Diff line
@@ -511,7 +511,9 @@ SpiceInfo *qmp_query_spice(Error **errp) 
    int port, tls_port;

    const char *addr;

    SpiceInfo *info;

    char version_string[20]; /* 12 = |255.255.255\0| is the max */

    unsigned int major;

    unsigned int minor;

    unsigned int micro;



    info = g_malloc0(sizeof(*info));
@@ -534,11 +536,10 @@ SpiceInfo *qmp_query_spice(Error **errp) 
    info->host = g_strdup(addr ? addr : "0.0.0.0");



    info->has_compiled_version = true;

    snprintf(version_string, sizeof(version_string), "%d.%d.%d",

             (SPICE_SERVER_VERSION & 0xff0000) >> 16,

             (SPICE_SERVER_VERSION & 0xff00) >> 8,

             SPICE_SERVER_VERSION & 0xff);

    info->compiled_version = g_strdup(version_string);

    major = (SPICE_SERVER_VERSION & 0xff0000) >> 16;

    minor = (SPICE_SERVER_VERSION & 0xff00) >> 8;

    micro = SPICE_SERVER_VERSION & 0xff;

    info->compiled_version = g_strdup_printf("%d.%d.%d", major, minor, micro);



    if (port) {

        info->has_port = true;
@@ -640,7 +641,7 @@ void qemu_spice_init(void) 
    char *x509_key_file = NULL,

        *x509_cert_file = NULL,

        *x509_cacert_file = NULL;

    int port, tls_port, len, addr_flags;

    int port, tls_port, addr_flags;

    spice_image_compression_t compression;

    spice_wan_compression_t wan_compr;

    bool seamless_migration;
@@ -671,30 +672,29 @@ void qemu_spice_init(void) 
        if (NULL == x509_dir) {

            x509_dir = ".";

        }

        len = strlen(x509_dir) + 32;



        str = qemu_opt_get(opts, "x509-key-file");

        if (str) {

            x509_key_file = g_strdup(str);

        } else {

            x509_key_file = g_malloc(len);

            snprintf(x509_key_file, len, "%s/%s", x509_dir, X509_SERVER_KEY_FILE);

            x509_key_file = g_strdup_printf("%s/%s", x509_dir,

                                            X509_SERVER_KEY_FILE);

        }



        str = qemu_opt_get(opts, "x509-cert-file");

        if (str) {

            x509_cert_file = g_strdup(str);

        } else {

            x509_cert_file = g_malloc(len);

            snprintf(x509_cert_file, len, "%s/%s", x509_dir, X509_SERVER_CERT_FILE);

            x509_cert_file = g_strdup_printf("%s/%s", x509_dir,

                                             X509_SERVER_CERT_FILE);

        }



        str = qemu_opt_get(opts, "x509-cacert-file");

        if (str) {

            x509_cacert_file = g_strdup(str);

        } else {

            x509_cacert_file = g_malloc(len);

            snprintf(x509_cacert_file, len, "%s/%s", x509_dir, X509_CA_CERT_FILE);

            x509_cacert_file = g_strdup_printf("%s/%s", x509_dir,

                                               X509_CA_CERT_FILE);

        }



        x509_key_password = qemu_opt_get(opts, "x509-key-password");