Commit 3d032f0f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* spice/spice.v51:
  ui/spice-display: use uintptr_t when casting qxl physical addresses
  ui/spice-display.c: Fix compilation warnings on 32 bit hosts
parents 81fe74dc a13ccc99

ui/spice-display.c

+11 −11
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot, 


    if (async != QXL_SYNC) {

        spice_qxl_add_memslot_async(&ssd->qxl, memslot,

                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                                          QXL_IO_MEMSLOT_ADD_ASYNC));

    } else {

        ssd->worker->add_memslot(ssd->worker, memslot);
@@ -100,7 +100,7 @@ void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id, 
    trace_qemu_spice_create_primary_surface(ssd->qxl.id, id, surface, async);

    if (async != QXL_SYNC) {

        spice_qxl_create_primary_surface_async(&ssd->qxl, id, surface,

                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                                          QXL_IO_CREATE_PRIMARY_ASYNC));

    } else {

        ssd->worker->create_primary_surface(ssd->worker, id, surface);
@@ -113,7 +113,7 @@ void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd, 
    trace_qemu_spice_destroy_primary_surface(ssd->qxl.id, id, async);

    if (async != QXL_SYNC) {

        spice_qxl_destroy_primary_surface_async(&ssd->qxl, id,

                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

                                          QXL_IO_DESTROY_PRIMARY_ASYNC));

    } else {

        ssd->worker->destroy_primary_surface(ssd->worker, id);
@@ -168,7 +168,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
    drawable->bbox            = ssd->dirty;

    drawable->clip.type       = SPICE_CLIP_TYPE_NONE;

    drawable->effect          = QXL_EFFECT_OPAQUE;

    drawable->release_info.id = (intptr_t)update;

    drawable->release_info.id = (uintptr_t)update;

    drawable->type            = QXL_DRAW_COPY;

    drawable->surfaces_dest[0] = -1;

    drawable->surfaces_dest[1] = -1;
@@ -179,7 +179,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
                      + time_space.tv_nsec / 1000 / 1000;



    drawable->u.copy.rop_descriptor  = SPICE_ROPD_OP_PUT;

    drawable->u.copy.src_bitmap      = (intptr_t)image;

    drawable->u.copy.src_bitmap      = (uintptr_t)image;

    drawable->u.copy.src_area.right  = bw;

    drawable->u.copy.src_area.bottom = bh;
@@ -189,7 +189,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
    image->bitmap.stride     = bw * 4;

    image->descriptor.width  = image->bitmap.x = bw;

    image->descriptor.height = image->bitmap.y = bh;

    image->bitmap.data = (intptr_t)(update->bitmap);

    image->bitmap.data = (uintptr_t)(update->bitmap);

    image->bitmap.palette = 0;

    image->bitmap.format = SPICE_BITMAP_FMT_32BIT;
@@ -210,7 +210,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
    }



    cmd->type = QXL_CMD_DRAW;

    cmd->data = (intptr_t)drawable;

    cmd->data = (uintptr_t)drawable;



    memset(&ssd->dirty, 0, sizeof(ssd->dirty));

    return update;
@@ -254,7 +254,7 @@ void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd) 
    surface.mouse_mode = true;

    surface.flags      = 0;

    surface.type       = 0;

    surface.mem        = (intptr_t)ssd->buf;

    surface.mem        = (uintptr_t)ssd->buf;

    surface.group_id   = MEMSLOT_GROUP_HOST;



    qemu_spice_create_primary_surface(ssd, 0, &surface, QXL_SYNC);