Merge tag 'm68k-pull-2023-12-22' of https://gitlab.com/huth/qemu into staging

[mirror_qemu.git] / qapi / common.json

diff --git a/qapi/common.json b/qapi/common.json
index 716712d4b317e81c926bf4f308e869b651c05330..6fed9cde1a9e11839d9532c72d5e6311c378d177 100644 (file)
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -70,6 +70,7 @@
 # has a different meaning.
 #
 # @s: the string value
+#
 # @n: no string value
 #
 # Since: 2.10
@@ -145,3 +146,64 @@
 ##
 { 'enum': 'PCIELinkWidth',
   'data': [ '1', '2', '4', '8', '12', '16', '32' ] }
+
+##
+# @HostMemPolicy:
+#
+# Host memory policy types
+#
+# @default: restore default policy, remove any nondefault policy
+#
+# @preferred: set the preferred host nodes for allocation
+#
+# @bind: a strict policy that restricts memory allocation to the host
+#     nodes specified
+#
+# @interleave: memory allocations are interleaved across the set of
+#     host nodes specified
+#
+# Since: 2.1
+##
+{ 'enum': 'HostMemPolicy',
+  'data': [ 'default', 'preferred', 'bind', 'interleave' ] }
+
+##
+# @NetFilterDirection:
+#
+# Indicates whether a netfilter is attached to a netdev's transmit
+# queue or receive queue or both.
+#
+# @all: the filter is attached both to the receive and the transmit
+#     queue of the netdev (default).
+#
+# @rx: the filter is attached to the receive queue of the netdev,
+#     where it will receive packets sent to the netdev.
+#
+# @tx: the filter is attached to the transmit queue of the netdev,
+#     where it will receive packets sent by the netdev.
+#
+# Since: 2.5
+##
+{ 'enum': 'NetFilterDirection',
+  'data': [ 'all', 'rx', 'tx' ] }
+
+##
+# @GrabToggleKeys:
+#
+# Keys to toggle input-linux between host and guest.
+#
+# Since: 4.0
+##
+{ 'enum': 'GrabToggleKeys',
+  'data': [ 'ctrl-ctrl', 'alt-alt', 'shift-shift','meta-meta', 'scrolllock',
+            'ctrl-scrolllock' ] }
+
+##
+# @HumanReadableText:
+#
+# @human-readable-text: Formatted output intended for humans.
+#
+# Since: 6.2
+##
+{ 'struct': 'HumanReadableText',
+  'data': { 'human-readable-text': 'str' } }