Commit b16a54da authored by Peter Maydell's avatar Peter Maydell
Browse files

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



gtk,spice: add dmabuf support.
sdl,vnc,gtk: bugfixes.
ui/qapi: add device ID and head parameters to screendump.
build: try improve handling of clang warnings.

# gpg: Signature made Mon 12 Mar 2018 09:13:28 GMT
# 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-20180312-pull-request:
  qapi: Add device ID and head parameters to screendump
  spice: add cursor_dmabuf support
  spice: add scanout_dmabuf support
  spice: drop dprint() debug logging
  vnc: deal with surface NULL pointers
  ui/gtk-egl: add cursor_dmabuf support
  ui/gtk-egl: add scanout_dmabuf support
  ui/gtk: use GtkGlArea on wayland only
  ui/opengl: Makefile cleanup
  ui/gtk: group gtk.mo declarations in Makefile
  ui/gtk: make GtkGlArea usage a runtime option
  sdl: workaround bug in sdl 2.0.8 headers
  make: switch language file build to be gtk module aware
  build: try improve handling of clang warnings

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 819fd469 f771c544

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ ifneq ($(BLOBS),) 
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \

	done

endif

ifeq ($(CONFIG_GTK),y)

ifeq ($(CONFIG_GTK),m)

	$(MAKE) -C po $@

endif

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"

configure

+2 −1
Original line number Diff line number Diff line
@@ -1692,6 +1692,7 @@ gcc_flags="-Wno-missing-include-dirs -Wempty-body -Wnested-externs $gcc_flags" 
gcc_flags="-Wendif-labels -Wno-shift-negative-value $gcc_flags"

gcc_flags="-Wno-initializer-overrides -Wexpansion-to-defined $gcc_flags"

gcc_flags="-Wno-string-plus-int $gcc_flags"

gcc_flags="-Wno-error=address-of-packed-member $gcc_flags"

# Note that we do not add -Werror to gcc_flags here, because that would

# enable it for all configure tests. If a configure test failed due

# to -Werror this would just silently disable some features,
@@ -2874,6 +2875,7 @@ if test "$sdl" != "no" ; then 
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }

EOF

  sdl_cflags=$($sdlconfig --cflags 2>/dev/null)

  sdl_cflags="$sdl_cflags -Wno-undef"  # workaround 2.0.8 bug

  if test "$static" = "yes" ; then

    if $pkg_config $sdlname --exists; then

      sdl_libs=$($pkg_config $sdlname --static --libs 2>/dev/null)
@@ -4860,7 +4862,6 @@ fi 
pragma_disable_unused_but_set=no

cat > $TMPC << EOF

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-but-set-variable"

#pragma GCC diagnostic ignored "-Wstrict-prototypes"

#pragma GCC diagnostic pop

hmp-commands.hx

+4 −3
Original line number Diff line number Diff line
@@ -253,9 +253,10 @@ ETEXI 


    {

        .name       = "screendump",

        .args_type  = "filename:F",

        .params     = "filename",

        .help       = "save screen into PPM image 'filename'",

        .args_type  = "filename:F,device:s?,head:i?",

        .params     = "filename [device [head]]",

        .help       = "save screen from head 'head' of display device 'device' "

                      "into PPM image 'filename'",

        .cmd        = hmp_screendump,

    },

hmp.c

+3 −1
Original line number Diff line number Diff line
@@ -2140,9 +2140,11 @@ err_out: 
void hmp_screendump(Monitor *mon, const QDict *qdict)

{

    const char *filename = qdict_get_str(qdict, "filename");

    const char *id = qdict_get_try_str(qdict, "device");

    int64_t head = qdict_get_try_int(qdict, "head", 0);

    Error *err = NULL;



    qmp_screendump(filename, &err);

    qmp_screendump(filename, id != NULL, id, id != NULL, head, &err);

    hmp_handle_error(mon, &err);

}

include/ui/console.h

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,8 @@ DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height, 
                                                    pixman_format_code_t format,

                                                    int linesize,

                                                    uint64_t addr);

DisplaySurface *qemu_create_message_surface(int w, int h,

                                            const char *msg);

PixelFormat qemu_default_pixelformat(int bpp);



DisplaySurface *qemu_create_displaysurface(int width, int height);