Commit 5144fe36 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160411-1' into staging 



virtio-gpu: pixman surface fix, block live migration

# gpg: Signature made Mon 11 Apr 2016 11:45:18 BST 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/kraxel/tags/pull-vga-20160411-1:
  virtio-gpu: block live migration
  ui/virtio-gpu: add and use qemu_create_displaysurface_pixman

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9628af03 fa49e465

hw/display/virtio-gpu.c

+8 −4
Original line number Diff line number Diff line
@@ -572,10 +572,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, 
        scanout->width != ss.r.width ||

        scanout->height != ss.r.height) {

        /* realloc the surface ptr */

        scanout->ds = qemu_create_displaysurface_from

            (ss.r.width, ss.r.height, format,

             pixman_image_get_stride(res->image),

             (uint8_t *)pixman_image_get_data(res->image) + offset);

        scanout->ds = qemu_create_displaysurface_pixman(res->image);

        if (!scanout->ds) {

            cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;

            return;
@@ -920,6 +917,11 @@ const GraphicHwOps virtio_gpu_ops = { 
    .gl_block = virtio_gpu_gl_block,

};



static const VMStateDescription vmstate_virtio_gpu_unmigratable = {

    .name = "virtio-gpu",

    .unmigratable = 1,

};



static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
@@ -971,6 +973,8 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) 
            dpy_gfx_replace_surface(g->scanout[i].con, NULL);

        }

    }



    vmstate_register(qdev, -1, &vmstate_virtio_gpu_unmigratable, g);

}



static void virtio_gpu_instance_init(Object *obj)

include/ui/console.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ DisplayState *init_displaystate(void); 
DisplaySurface *qemu_create_displaysurface_from(int width, int height,

                                                pixman_format_code_t format,

                                                int linesize, uint8_t *data);

DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image);

DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,

                                                    pixman_format_code_t format,

                                                    int linesize,

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ console_select(int nr) "%d" 
console_refresh(int interval) "interval %d ms"

displaysurface_create(void *display_surface, int w, int h) "surface=%p, %dx%d"

displaysurface_create_from(void *display_surface, int w, int h, uint32_t format) "surface=%p, %dx%d, format 0x%x"

displaysurface_create_pixman(void *display_surface) "surface=%p"

displaysurface_free(void *display_surface) "surface=%p"

displaychangelistener_register(void *dcl, const char *name) "%p [ %s ]"

displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]"

ui/console.c

+11 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,17 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, 
    return surface;

}



DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)

{

    DisplaySurface *surface = g_new0(DisplaySurface, 1);



    trace_displaysurface_create_pixman(surface);

    surface->format = pixman_image_get_format(image);

    surface->image = pixman_image_ref(image);



    return surface;

}



static void qemu_unmap_displaysurface_guestmem(pixman_image_t *image,

                                               void *unused)

{