Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190121-pull-request' into...

[qemu.git] / qapi / ui.json

diff --git a/qapi/ui.json b/qapi/ui.json
index 4ca91bb45a3888d829caface18fa3fa752507287..5ad13248d54030aa2e595c7bd40519acd0e901ac 100644 (file)
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -598,7 +598,8 @@
 # Notes:  An empty password in this command will set the password to the empty
 #         string.  Existing clients are unaffected by executing this command.
 ##
 # Notes:  An empty password in this command will set the password to the empty
 #         string.  Existing clients are unaffected by executing this command.
 ##

-{ 'command': 'change-vnc-password', 'data': {'password': 'str'},
+{ 'command': 'change-vnc-password',
+  'data': { 'password': 'str' },

   'if': 'defined(CONFIG_VNC)' }
 
 ##
   'if': 'defined(CONFIG_VNC)' }
 
 ##


@@ -1022,12 +1023,34 @@
 # GTK display options.
 #
 # @grab-on-hover: Grab keyboard input on mouse hover.
 # GTK display options.
 #
 # @grab-on-hover: Grab keyboard input on mouse hover.

+# @zoom-to-fit: Zoom guest display to fit into the host window.  When
+#               turned off the host window will be resized instead.
+#               In case the display device can notify the guest on
+#               window resizes (virtio-gpu) this will default to "on",
+#               assuming the guest will resize the display to match
+#               the window size then.  Otherwise it defaults to "off".
+#               Since 3.1

 #
 # Since: 2.12
 #
 ##
 { 'struct'  : 'DisplayGTK',
 #
 # Since: 2.12
 #
 ##
 { 'struct'  : 'DisplayGTK',

-  'data'    : { '*grab-on-hover' : 'bool' } }
+  'data'    : { '*grab-on-hover' : 'bool',
+                '*zoom-to-fit'   : 'bool'  } }
+
+##
+# @DisplayEGLHeadless:
+#
+# EGL headless display options.
+#
+# @rendernode: Which DRM render node should be used. Default is the first
+#              available node on the host.
+#
+# Since: 3.1
+#
+##
+{ 'struct'  : 'DisplayEGLHeadless',
+  'data'    : { '*rendernode' : 'str' } }

 
  ##
  # @DisplayGLMode:
 
  ##
  # @DisplayGLMode:


@@ -1078,4 +1101,18 @@
                 '*window-close'  : 'bool',
                 '*gl'            : 'DisplayGLMode' },
   'discriminator' : 'type',
                 '*window-close'  : 'bool',
                 '*gl'            : 'DisplayGLMode' },
   'discriminator' : 'type',

-  'data'    : { 'gtk'            : 'DisplayGTK' } }
+  'data'    : { 'gtk'            : 'DisplayGTK',
+                'egl-headless'   : 'DisplayEGLHeadless'} }
+
+##
+# @query-display-options:
+#
+# Returns information about display configuration
+#
+# Returns: @DisplayOptions
+#
+# Since: 3.1
+#
+##
+{ 'command': 'query-display-options',
+  'returns': 'DisplayOptions' }