summary refs log tree commit diff stats
path: root/monitor.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-10-05 16:49:01 -0300
committerMarkus Armbruster <armbru@redhat.com>2016-10-07 19:22:11 +0200
commit728b1429b16ebcc09ca7936d8689db9e006acbef (patch)
tree58bf43646d17fa161b6713a5c6c735bdcd6e58dd /monitor.c
parentdaf5dc7806f7bbb825506054a7c00a90b841b7cc (diff)
downloadfocaccia-qemu-728b1429b16ebcc09ca7936d8689db9e006acbef.tar.gz
focaccia-qemu-728b1429b16ebcc09ca7936d8689db9e006acbef.zip
qmp: Disable query-cpu-* commands when they're unavailable
Instead of requiring clients to actually call the query-cpu-*
commands to find out if they are implemented, remove them from
the output of "query-commands", so clients know they are not
available.

This is implemented by extending the existing hack at
qmp_unregister_commands_hack(). I wish I could avoid adding even
more #ifdefs to that code, but that's the solution we have today.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1475696941-8056-1-git-send-email-ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c
index 83c4edfce0..4ff74b7fd0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -992,6 +992,15 @@ static void qmp_unregister_commands_hack(void)
 #ifndef TARGET_ARM
     qmp_unregister_command("query-gic-capabilities");
 #endif
+#if !defined(TARGET_S390X)
+    qmp_unregister_command("query-cpu-model-expansion");
+    qmp_unregister_command("query-cpu-model-baseline");
+    qmp_unregister_command("query-cpu-model-comparison");
+#endif
+#if !defined(TARGET_PPC) && !defined(TARGET_ARM) && !defined(TARGET_I386) \
+    && !defined(TARGET_S390X)
+    qmp_unregister_command("query-cpu-definitions");
+#endif
 }
 
 static void qmp_init_marshal(void)