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

virtio-gpu: bugfixes and spice support preparation

# gpg: Signature made Wed 03 Feb 2016 09:47:13 GMT 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-20160203-1:
  virtio-gpu: block any rendering until client (ui) is done
  virtio-gpu: add support to enable/disable command processing
  virtio-gpu: maintain command queue
  virtio-gpu: fix memory leak in error path
  console: block rendering until client is done
  zap qemu_egl_has_ext in include/ui/egl-helpers.h

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined include/ui/console.h
index 116bc2b,12ad627..c8f9f7e
--- 1/include/ui/console.h
--- 2/include/ui/console.h
+++ b/include/ui/console.h
@@@ -362,6 -362,7 +362,7 @@@ typedef struct GraphicHwOps 
      void (*text_update)(void *opaque, console_ch_t *text);
      void (*update_interval)(void *opaque, uint64_t interval);
      int (*ui_info)(void *opaque, uint32_t head, QemuUIInfo *info);
+     void (*gl_block)(void *opaque, bool block);
  } GraphicHwOps;
  
  QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
@@@ -374,6 -375,7 +375,7 @@@ void graphic_console_set_hwops(QemuCons
  void graphic_hw_update(QemuConsole *con);
  void graphic_hw_invalidate(QemuConsole *con);
  void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata);
+ void graphic_hw_gl_block(QemuConsole *con, bool block);
  
  QemuConsole *qemu_console_lookup_by_index(unsigned int index);
  QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head);
@@@ -448,7 -450,7 +450,7 @@@ static inline int vnc_display_pw_expire
  void curses_display_init(DisplayState *ds, int full_screen);
  
  /* input.c */
 -int index_from_key(const char *key);
 +int index_from_key(const char *key, size_t key_length);
  
  /* gtk.c */
  void early_gtk_display_init(int opengl);