Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[mirror_qemu.git] / qapi / ui.json

diff --git a/qapi/ui.json b/qapi/ui.json
index c5d1d7f09966507f4745c84ffeabbcd8f6d0a6a7..59e412139adc06a48e3d5fe772972fce6dab70cd 100644 (file)
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1080,6 +1080,19 @@
  { 'enum'    : 'DisplayGLMode',
    'data'    : [ 'off', 'on', 'core', 'es' ] }
 
+##
+# @DisplayCurses:
+#
+# Curses display options.
+#
+# @charset:       Font charset used by guest (default: CP437).
+#
+# Since: 4.0
+#
+##
+{ 'struct'  : 'DisplayCurses',
+  'data'    : { '*charset'       : 'str' } }
+
 ##
 # @DisplayType:
 #
@@ -1142,6 +1155,7 @@
                 '*gl'            : 'DisplayGLMode' },
   'discriminator' : 'type',
   'data'    : { 'gtk'            : 'DisplayGTK',
+                'curses'         : 'DisplayCurses',
                 'egl-headless'   : 'DisplayEGLHeadless'} }
 
 ##