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

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



* spice/spice.v63:
  spice: fix initialization order
  pflib: unused, remove it.
  spice: switch to pixman
  qxl: call dpy_gfx_resize when entering vga mode
  qxl: fix cursor reset
  hw/qxl: qxl_send_events: nop if stopped
  hw/qxl: guest bug on primary create with stride %4 != 0

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents f5022a13 bdd4df33

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ common-obj-y += input.o 
common-obj-y += buffered_file.o migration.o migration-tcp.o

common-obj-y += qemu-char.o #aio.o

common-obj-y += block-migration.o iohandler.o

common-obj-y += pflib.o

common-obj-y += bitmap.o bitops.o

common-obj-y += page_cache.o

console.h

+5 −0
Original line number Diff line number Diff line
@@ -377,6 +377,11 @@ static inline pixman_format_code_t ds_get_format(DisplayState *ds) 
    return ds->surface->format;

}



static inline pixman_image_t *ds_get_image(DisplayState *ds)

{

    return ds->surface->image;

}



static inline int ds_get_depth(DisplayState *ds)

{

    return ds->surface->pf.depth;

hw/qxl.c

+32 −4
Original line number Diff line number Diff line
@@ -293,6 +293,10 @@ void qxl_spice_reset_cursor(PCIQXLDevice *qxl) 
    qemu_mutex_lock(&qxl->track_lock);

    qxl->guest_cursor = 0;

    qemu_mutex_unlock(&qxl->track_lock);

    if (qxl->ssd.cursor) {

        cursor_put(qxl->ssd.cursor);

    }

    qxl->ssd.cursor = cursor_builtin_hidden();

}
@@ -447,6 +451,12 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) 
                              qxl->ssd.num_surfaces);

            return 1;

        }

        if (cmd->type == QXL_SURFACE_CMD_CREATE &&

            (cmd->u.surface_create.stride & 0x03) != 0) {

            qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE stride = %d %% 4 != 0\n",

                              cmd->u.surface_create.stride);

            return 1;

        }

        qemu_mutex_lock(&qxl->track_lock);

        if (cmd->type == QXL_SURFACE_CMD_CREATE) {

            qxl->guest_surfaces.cmds[id] = ext->cmd.data;
@@ -1059,7 +1069,7 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) 
    trace_qxl_enter_vga_mode(d->id);

    qemu_spice_create_host_primary(&d->ssd);

    d->mode = QXL_MODE_VGA;

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

    dpy_gfx_resize(d->ssd.ds);

    vga_dirty_log_start(&d->vga);

}
@@ -1357,6 +1367,12 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm, 
    trace_qxl_create_guest_primary_rest(qxl->id, sc->stride, sc->type,

                                        sc->flags);



    if ((surface.stride & 0x3) != 0) {

        qxl_set_guest_bug(qxl, "primary surface stride = %d %% 4 != 0",

                          surface.stride);

        return;

    }



    surface.mouse_mode = true;

    surface.group_id   = MEMSLOT_GROUP_GUEST;

    if (loadvm) {
@@ -1689,7 +1705,13 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events) 
    uint32_t le_events = cpu_to_le32(events);



    trace_qxl_send_events(d->id, events);

    assert(qemu_spice_display_is_running(&d->ssd));

    if (!qemu_spice_display_is_running(&d->ssd)) {

        /* spice-server tracks guest running state and should not do this */

        fprintf(stderr, "%s: spice-server bug: guest stopped, ignoring\n",

                __func__);

        trace_qxl_send_events_vm_stopped(d->id, events);

        return;

    }

    old_pending = __sync_fetch_and_or(&d->ram->int_pending, le_events);

    if ((old_pending & le_events) == le_events) {

        return;
@@ -2027,6 +2049,7 @@ static int qxl_init_primary(PCIDevice *dev) 
    PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev);

    VGACommonState *vga = &qxl->vga;

    PortioList *qxl_vga_port_list = g_new(PortioList, 1);

    int rc;



    qxl->id = 0;

    qxl_init_ramsize(qxl);
@@ -2041,9 +2064,14 @@ static int qxl_init_primary(PCIDevice *dev) 
    qemu_spice_display_init_common(&qxl->ssd, vga->ds);



    qxl0 = qxl;

    register_displaychangelistener(vga->ds, &display_listener);



    return qxl_init_common(qxl);

    rc = qxl_init_common(qxl);

    if (rc != 0) {

        return rc;

    }



    register_displaychangelistener(vga->ds, &display_listener);

    return rc;

}



static int qxl_init_secondary(PCIDevice *dev)

pflib.c

deleted100644 → 0
+0 −215
Original line number Diff line number Diff line 
/*

 * PixelFormat conversion library.

 *

 * Author: Gerd Hoffmann <kraxel@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 * Contributions after 2012-01-13 are licensed under the terms of the

 * GNU GPL, version 2 or (at your option) any later version.

 */

#include "qemu-common.h"

#include "console.h"

#include "pflib.h"



typedef struct QemuPixel QemuPixel;



typedef void (*pf_convert)(QemuPfConv *conv,

                           void *dst, void *src, uint32_t cnt);

typedef void (*pf_convert_from)(PixelFormat *pf,

                                QemuPixel *dst, void *src, uint32_t cnt);

typedef void (*pf_convert_to)(PixelFormat *pf,

                              void *dst, QemuPixel *src, uint32_t cnt);



struct QemuPfConv {

    pf_convert        convert;

    PixelFormat       src;

    PixelFormat       dst;



    /* for copy_generic() */

    pf_convert_from   conv_from;

    pf_convert_to     conv_to;

    QemuPixel         *conv_buf;

    uint32_t          conv_cnt;

};



struct QemuPixel {

    uint8_t red;

    uint8_t green;

    uint8_t blue;

    uint8_t alpha;

};



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

/* PixelFormat -> QemuPixel conversions                                    */



static void conv_16_to_pixel(PixelFormat *pf,

                             QemuPixel *dst, void *src, uint32_t cnt)

{

    uint16_t *src16 = src;



    while (cnt > 0) {

        dst->red   = ((*src16 & pf->rmask) >> pf->rshift) << (8 - pf->rbits);

        dst->green = ((*src16 & pf->gmask) >> pf->gshift) << (8 - pf->gbits);

        dst->blue  = ((*src16 & pf->bmask) >> pf->bshift) << (8 - pf->bbits);

        dst->alpha = ((*src16 & pf->amask) >> pf->ashift) << (8 - pf->abits);

        dst++, src16++, cnt--;

    }

}



/* assumes pf->{r,g,b,a}bits == 8 */

static void conv_32_to_pixel_fast(PixelFormat *pf,

                                  QemuPixel *dst, void *src, uint32_t cnt)

{

    uint32_t *src32 = src;



    while (cnt > 0) {

        dst->red   = (*src32 & pf->rmask) >> pf->rshift;

        dst->green = (*src32 & pf->gmask) >> pf->gshift;

        dst->blue  = (*src32 & pf->bmask) >> pf->bshift;

        dst->alpha = (*src32 & pf->amask) >> pf->ashift;

        dst++, src32++, cnt--;

    }

}



static void conv_32_to_pixel_generic(PixelFormat *pf,

                                     QemuPixel *dst, void *src, uint32_t cnt)

{

    uint32_t *src32 = src;



    while (cnt > 0) {

        if (pf->rbits < 8) {

            dst->red   = ((*src32 & pf->rmask) >> pf->rshift) << (8 - pf->rbits);

        } else {

            dst->red   = ((*src32 & pf->rmask) >> pf->rshift) >> (pf->rbits - 8);

        }

        if (pf->gbits < 8) {

            dst->green = ((*src32 & pf->gmask) >> pf->gshift) << (8 - pf->gbits);

        } else {

            dst->green = ((*src32 & pf->gmask) >> pf->gshift) >> (pf->gbits - 8);

        }

        if (pf->bbits < 8) {

            dst->blue  = ((*src32 & pf->bmask) >> pf->bshift) << (8 - pf->bbits);

        } else {

            dst->blue  = ((*src32 & pf->bmask) >> pf->bshift) >> (pf->bbits - 8);

        }

        if (pf->abits < 8) {

            dst->alpha = ((*src32 & pf->amask) >> pf->ashift) << (8 - pf->abits);

        } else {

            dst->alpha = ((*src32 & pf->amask) >> pf->ashift) >> (pf->abits - 8);

        }

        dst++, src32++, cnt--;

    }

}



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

/* QemuPixel -> PixelFormat conversions                                    */



static void conv_pixel_to_16(PixelFormat *pf,

                             void *dst, QemuPixel *src, uint32_t cnt)

{

    uint16_t *dst16 = dst;



    while (cnt > 0) {

        *dst16  = ((uint16_t)src->red   >> (8 - pf->rbits)) << pf->rshift;

        *dst16 |= ((uint16_t)src->green >> (8 - pf->gbits)) << pf->gshift;

        *dst16 |= ((uint16_t)src->blue  >> (8 - pf->bbits)) << pf->bshift;

        *dst16 |= ((uint16_t)src->alpha >> (8 - pf->abits)) << pf->ashift;

        dst16++, src++, cnt--;

    }

}



static void conv_pixel_to_32(PixelFormat *pf,

                             void *dst, QemuPixel *src, uint32_t cnt)

{

    uint32_t *dst32 = dst;



    while (cnt > 0) {

        *dst32  = ((uint32_t)src->red   >> (8 - pf->rbits)) << pf->rshift;

        *dst32 |= ((uint32_t)src->green >> (8 - pf->gbits)) << pf->gshift;

        *dst32 |= ((uint32_t)src->blue  >> (8 - pf->bbits)) << pf->bshift;

        *dst32 |= ((uint32_t)src->alpha >> (8 - pf->abits)) << pf->ashift;

        dst32++, src++, cnt--;

    }

}



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

/* PixelFormat -> PixelFormat conversions                                  */



static void convert_copy(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)

{

    uint32_t bytes = cnt * conv->src.bytes_per_pixel;

    memcpy(dst, src, bytes);

}



static void convert_generic(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)

{

    if (conv->conv_cnt < cnt) {

        conv->conv_cnt = cnt;

        conv->conv_buf = g_realloc(conv->conv_buf, sizeof(QemuPixel) * conv->conv_cnt);

    }

    conv->conv_from(&conv->src, conv->conv_buf, src, cnt);

    conv->conv_to(&conv->dst, dst, conv->conv_buf, cnt);

}



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

/* public interface                                                        */



QemuPfConv *qemu_pf_conv_get(PixelFormat *dst, PixelFormat *src)

{

    QemuPfConv *conv = g_malloc0(sizeof(QemuPfConv));



    conv->src = *src;

    conv->dst = *dst;



    if (memcmp(&conv->src, &conv->dst, sizeof(PixelFormat)) == 0) {

        /* formats identical, can simply copy */

        conv->convert = convert_copy;

    } else {

        /* generic two-step conversion: src -> QemuPixel -> dst  */

        switch (conv->src.bytes_per_pixel) {

        case 2:

            conv->conv_from = conv_16_to_pixel;

            break;

        case 4:

            if (conv->src.rbits == 8 && conv->src.gbits == 8 && conv->src.bbits == 8) {

                conv->conv_from = conv_32_to_pixel_fast;

            } else {

                conv->conv_from = conv_32_to_pixel_generic;

            }

            break;

        default:

            goto err;

        }

        switch (conv->dst.bytes_per_pixel) {

        case 2:

            conv->conv_to = conv_pixel_to_16;

            break;

        case 4:

            conv->conv_to = conv_pixel_to_32;

            break;

        default:

            goto err;

        }

        conv->convert = convert_generic;

    }

    return conv;



err:

    g_free(conv);

    return NULL;

}



void qemu_pf_conv_run(QemuPfConv *conv, void *dst, void *src, uint32_t cnt)

{

    conv->convert(conv, dst, src, cnt);

}



void qemu_pf_conv_put(QemuPfConv *conv)

{

    if (conv) {

        g_free(conv->conv_buf);

        g_free(conv);

    }

}

pflib.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#ifndef __QEMU_PFLIB_H

#define __QEMU_PFLIB_H



/*

 * PixelFormat conversion library.

 *

 * Author: Gerd Hoffmann <kraxel@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 */



typedef struct QemuPfConv QemuPfConv;



QemuPfConv *qemu_pf_conv_get(PixelFormat *dst, PixelFormat *src);

void qemu_pf_conv_run(QemuPfConv *conv, void *dst, void *src, uint32_t cnt);

void qemu_pf_conv_put(QemuPfConv *conv);



#endif