qapi: Restrict 'query-kvm' command to machine code

Restricting query-kvm to machine.json pulls slightly
less QAPI-generated code into user-mode and tools.

Acked-by: Paolo Bonzini <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <20201012121536.3381997[email protected]>
Reviewed-by: Eduardo Habkost <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>

diff --git a/qapi/machine.json b/qapi/machine.json
index 5a3bbcae01b3c7627badacf84bb5f1530e017326..7c9a263778d8b5757d828f7f833de517ea3c5ffc 100644 (file)
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -561,6 +561,36 @@
 ##
 { 'command': 'inject-nmi' }
 
 ##
 { 'command': 'inject-nmi' }
 

+##
+# @KvmInfo:
+#
+# Information about support for KVM acceleration
+#
+# @enabled: true if KVM acceleration is active
+#
+# @present: true if KVM acceleration is built into this executable
+#
+# Since: 0.14.0
+##
+{ 'struct': 'KvmInfo', 'data': {'enabled': 'bool', 'present': 'bool'} }
+
+##
+# @query-kvm:
+#
+# Returns information about KVM acceleration
+#
+# Returns: @KvmInfo
+#
+# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-kvm" }
+# <- { "return": { "enabled": true, "present": true } }
+#
+##
+{ 'command': 'query-kvm', 'returns': 'KvmInfo' }
+

 ##
 # @NumaOptionsType:
 #
 ##
 # @NumaOptionsType:
 #

diff --git a/qapi/misc.json b/qapi/misc.json
index 9fa702b0f661e7bc2e7c96e43199c0df2f5a7fd9..363115c1edb65cd40352258370e33b5727234f61 100644 (file)
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -68,36 +68,6 @@
 ##
 { 'command': 'query-name', 'returns': 'NameInfo', 'allow-preconfig': true }
 
 ##
 { 'command': 'query-name', 'returns': 'NameInfo', 'allow-preconfig': true }
 

-##
-# @KvmInfo:
-#
-# Information about support for KVM acceleration
-#
-# @enabled: true if KVM acceleration is active
-#
-# @present: true if KVM acceleration is built into this executable
-#
-# Since: 0.14.0
-##
-{ 'struct': 'KvmInfo', 'data': {'enabled': 'bool', 'present': 'bool'} }
-
-##
-# @query-kvm:
-#
-# Returns information about KVM acceleration
-#
-# Returns: @KvmInfo
-#
-# Since: 0.14.0
-#
-# Example:
-#
-# -> { "execute": "query-kvm" }
-# <- { "return": { "enabled": true, "present": true } }
-#
-##
-{ 'command': 'query-kvm', 'returns': 'KvmInfo' }
-

 ##
 # @IOThreadInfo:
 #
 ##
 # @IOThreadInfo:
 #