Commit 10f4718b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180427-pull-request' into staging 



vnc: fix use-after-free.
sdl2: gles support.
vfio-display: add reset support.

# gpg: Signature made Fri 27 Apr 2018 10:54:17 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180427-pull-request:
  ui: introduce vfio_display_reset
  console: introduce dpy_gfx_update_full
  sdl: Allow OpenGL ES context creation
  sdl: Move DisplayOptions global to sdl2_console
  qapi: Parameter gl of DisplayType now accept an enum
  vnc: fix use-after-free

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dcbd26f8 8983e3e3

hw/vfio/display.c

+11 −0
Original line number Diff line number Diff line
@@ -198,6 +198,17 @@ static void vfio_display_dmabuf_exit(VFIODisplay *dpy) 
}



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

void vfio_display_reset(VFIOPCIDevice *vdev)

{

    if (!vdev || !vdev->dpy || !vdev->dpy->con ||

        !vdev->dpy->dmabuf.primary) {

        return;

    }



    dpy_gl_scanout_disable(vdev->dpy->con);

    vfio_display_dmabuf_exit(vdev->dpy);

    dpy_gfx_update_full(vdev->dpy->con);

}



static void vfio_display_region_update(void *opaque)

{

hw/vfio/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -3103,6 +3103,10 @@ static void vfio_pci_reset(DeviceState *dev) 


    vfio_pci_pre_reset(vdev);



    if (vdev->display != ON_OFF_AUTO_OFF) {

        vfio_display_reset(vdev);

    }



    if (vdev->resetfn && !vdev->resetfn(vdev)) {

        goto post_reset;

    }

hw/vfio/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev, 
                               struct vfio_region_info *info,

                               Error **errp);



void vfio_display_reset(VFIOPCIDevice *vdev);

int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);

void vfio_display_finalize(VFIOPCIDevice *vdev);

include/ui/console.h

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ bool dpy_ui_info_supported(QemuConsole *con); 
int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info);



void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h);

void dpy_gfx_update_full(QemuConsole *con);

void dpy_gfx_replace_surface(QemuConsole *con,

                             DisplaySurface *surface);

void dpy_text_cursor(QemuConsole *con, int x, int y);

include/ui/sdl2.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
struct sdl2_console {

    DisplayChangeListener dcl;

    DisplaySurface *surface;

    DisplayOptions *opts;

    SDL_Texture *texture;

    SDL_Window *real_window;

    SDL_Renderer *real_renderer;