[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 50/54] qapi: make rtc-reset-reinjection depend on
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 50/54] qapi: make rtc-reset-reinjection depend on TARGET_I386 |
Date: |
Tue, 22 Aug 2017 15:22:51 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
qapi-schema.json | 3 ++-
monitor.c | 10 ----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 1091a80fd3..58574b3044 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -6294,7 +6294,8 @@
# <- { "return": {} }
#
##
-{ 'command': 'rtc-reset-reinjection' }
+{ 'command': 'rtc-reset-reinjection',
+ 'if': ['defined(NEED_CPU_H)', 'defined(TARGET_I386)'] }
# Rocker ethernet network switch
{ 'include': 'qapi/rocker.json' }
diff --git a/monitor.c b/monitor.c
index 008d7c2b06..fcacf10f59 100644
--- a/monitor.c
+++ b/monitor.c
@@ -971,9 +971,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject
**ret_data,
*/
static void qmp_unregister_commands_hack(void)
{
-#ifndef TARGET_I386
- qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection");
-#endif
#ifndef TARGET_S390X
qmp_unregister_command(&qmp_commands, "dump-skeys");
#endif
@@ -4156,13 +4153,6 @@ QemuOptsList qemu_mon_opts = {
},
};
-#ifndef TARGET_I386
-void qmp_rtc_reset_reinjection(Error **errp)
-{
- error_setg(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection");
-}
-#endif
-
#ifndef TARGET_S390X
void qmp_dump_skeys(const char *filename, Error **errp)
{
--
2.14.1.146.gd35faa819
- Re: [Qemu-devel] [PATCH v2 04/54] qlit: add qobject_form_qlit(), (continued)
- [Qemu-devel] [PATCH v2 38/54] qapi: add tests for invalid alternate, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 42/54] qapi2texi: add 'If:' condition to enum values, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 11/54] quorum: use qapi_enum_parse() in quorum_open, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 05/54] qapi: generate a literal qobject for introspection, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 31/54] tests: add some enum members tests, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 16/54] qapi: add a test for invalid 'if', Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 35/54] qapi: add 'if' on union variants, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 19/54] qapi: add #if/#endif helpers, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 50/54] qapi: make rtc-reset-reinjection depend on TARGET_I386,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 17/54] qapi: add 'if' condition on entity objects, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 33/54] qapi: add some struct member tests, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 45/54] qapi: add conditions to VNC type/commands/events on the schema, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 51/54] qapi: make s390 commands depend on TARGET_S390X, Marc-André Lureau, 2017/08/22
- Re: [Qemu-devel] [PATCH v2 51/54] qapi: make s390 commands depend on TARGET_S390X, Markus Armbruster, 2017/08/22