Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' into staging

[qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index f8f4a07cfb149128ec007ef75bc695047ac54452..b68944d93c95648d90c52ec4973d7cfa6e7d7b1b 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -984,8 +984,10 @@ static void qmp_unregister_commands_hack(void)
 #ifndef TARGET_ARM
     qmp_unregister_command("query-gic-capabilities");
 #endif
 #ifndef TARGET_ARM
     qmp_unregister_command("query-gic-capabilities");
 #endif

-#if !defined(TARGET_S390X)
+#if !defined(TARGET_S390X) && !defined(TARGET_I386)

     qmp_unregister_command("query-cpu-model-expansion");
     qmp_unregister_command("query-cpu-model-expansion");

+#endif
+#if !defined(TARGET_S390X)

     qmp_unregister_command("query-cpu-model-baseline");
     qmp_unregister_command("query-cpu-model-comparison");
 #endif
     qmp_unregister_command("query-cpu-model-baseline");
     qmp_unregister_command("query-cpu-model-comparison");
 #endif