diff options
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/audio.json | 22 | ||||
| -rw-r--r-- | qapi/char.json | 27 |
2 files changed, 48 insertions, 1 deletions
diff --git a/qapi/audio.json b/qapi/audio.json index 519697c0cd..dd5a58d13e 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -66,6 +66,26 @@ '*out': 'AudiodevPerDirectionOptions' } } ## +# @AudiodevDBusOptions: +# +# Options of the D-Bus audio backend. +# +# @in: options of the capture stream +# +# @out: options of the playback stream +# +# @nsamples: set the number of samples per read/write calls (default to 480, +# 10ms at 48kHz). +# +# Since: 10.0 +## +{ 'struct': 'AudiodevDBusOptions', + 'data': { + '*in': 'AudiodevPerDirectionOptions', + '*out': 'AudiodevPerDirectionOptions', + '*nsamples': 'uint32'} } + +## # @AudiodevAlsaPerDirectionOptions: # # Options of the ALSA backend that are used for both playback and @@ -490,7 +510,7 @@ 'if': 'CONFIG_AUDIO_ALSA' }, 'coreaudio': { 'type': 'AudiodevCoreaudioOptions', 'if': 'CONFIG_AUDIO_COREAUDIO' }, - 'dbus': { 'type': 'AudiodevGenericOptions', + 'dbus': { 'type': 'AudiodevDBusOptions', 'if': 'CONFIG_DBUS_DISPLAY' }, 'dsound': { 'type': 'AudiodevDsoundOptions', 'if': 'CONFIG_AUDIO_DSOUND' }, diff --git a/qapi/char.json b/qapi/char.json index e045354350..f02b66c06b 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -333,6 +333,19 @@ 'base': 'ChardevCommon' } ## +# @ChardevHub: +# +# Configuration info for hub chardevs. +# +# @chardevs: List of chardev IDs, which should be added to this hub +# +# Since: 10.0 +## +{ 'struct': 'ChardevHub', + 'data': { 'chardevs': ['str'] }, + 'base': 'ChardevCommon' } + +## # @ChardevStdio: # # Configuration info for stdio chardevs. @@ -479,6 +492,8 @@ # # @mux: (since 1.5) # +# @hub: (since 10.0) +# # @msmouse: emulated Microsoft serial mouse (since 1.5) # # @wctablet: emulated Wacom Penpartner serial tablet (since 2.9) @@ -521,6 +536,7 @@ 'pty', 'null', 'mux', + 'hub', 'msmouse', 'wctablet', { 'name': 'braille', 'if': 'CONFIG_BRLAPI' }, @@ -596,6 +612,16 @@ 'data': { 'data': 'ChardevMux' } } ## +# @ChardevHubWrapper: +# +# @data: Configuration info for hub chardevs +# +# Since: 10.0 +## +{ 'struct': 'ChardevHubWrapper', + 'data': { 'data': 'ChardevHub' } } + +## # @ChardevStdioWrapper: # # @data: Configuration info for stdio chardevs @@ -703,6 +729,7 @@ 'pty': 'ChardevPtyWrapper', 'null': 'ChardevCommonWrapper', 'mux': 'ChardevMuxWrapper', + 'hub': 'ChardevHubWrapper', 'msmouse': 'ChardevCommonWrapper', 'wctablet': 'ChardevCommonWrapper', 'braille': { 'type': 'ChardevCommonWrapper', |