summaryrefslogtreecommitdiffstats
path: root/qapi/common.json
diff options
context:
space:
mode:
authorDon Slutz <dslutz@verizon.com>2014-11-21 11:18:52 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-26 12:11:27 +0100
commitd1048bef9df0aacde9a54bf9b5b97a6e10950d8c (patch)
treef7028b9b852ae94b7c949907541335a2233ef65f /qapi/common.json
parent2528043f1f299e0e88cb026f1ca7c40bbb4e1f80 (diff)
downloadhqemu-d1048bef9df0aacde9a54bf9b5b97a6e10950d8c.zip
hqemu-d1048bef9df0aacde9a54bf9b5b97a6e10950d8c.tar.gz
-machine vmport=auto: Fix handling of VMWare ioport emulation for xen
c/s 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4 or c/s b154537ad07598377ebf98252fb7d2aff127983b moved the testing of xen_enabled() from pc_init1() to pc_machine_initfn(). xen_enabled() does not return the correct value in pc_machine_initfn(). Changed vmport from a bool to an enum. Added the value "auto" to do the old way. Move check of xen_enabled() back to pc_init1(). Acked-by: Eric Blake <eblake@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Don Slutz <dslutz@verizon.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qapi/common.json')
-rw-r--r--qapi/common.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/qapi/common.json b/qapi/common.json
index 4e9a21f..63ef3b4 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -87,3 +87,18 @@
##
{ 'command': 'query-commands', 'returns': ['CommandInfo'] }
+##
+# @OnOffAuto
+#
+# An enumeration of three options: on, off, and auto
+#
+# @auto: QEMU selects the value between on and off
+#
+# @on: Enabled
+#
+# @off: Disabled
+#
+# Since: 2.2
+##
+{ 'enum': 'OnOffAuto',
+ 'data': [ 'auto', 'on', 'off' ] }
OpenPOWER on IntegriCloud