aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-02-21 19:21:21 +0000
committerMarkus Armbruster <armbru@redhat.com>2022-02-28 11:39:35 +0100
commit1f216b8ca961e95c221a5e9c84d264ab0f3d7667 (patch)
tree8aff4eeffd63f1ca52f8cc56fa6400f50399cf26 /qapi
parentb1ca53224a9161292a2801f0f41377f3ee83c609 (diff)
downloadqemu-1f216b8ca961e95c221a5e9c84d264ab0f3d7667.zip
qemu-1f216b8ca961e95c221a5e9c84d264ab0f3d7667.tar.gz
qemu-1f216b8ca961e95c221a5e9c84d264ab0f3d7667.tar.bz2
qapi: Move RTC_CHANGE back out of target schema
This commit effectively reverts commit 183e4281a30962, which moved the RTC_CHANGE event to the target schema. That change was an attempt to make the event target-specific to improve introspection, but the event isn't really target-specific: it's machine or device specific. Putting RTC_CHANGE in the target schema with an ifdef list reduces maintainability (by adding an if: list with a long list of targets that needs to be manually updated as architectures are added or removed or as new devices gain the RTC_CHANGE functionality) and increases compile time (by preventing RTC devices which emit the event from being "compile once" rather than "compile once per target", because qapi-events-misc-target.h uses TARGET_* ifdefs, which are poisoned in "compile once" files.) Move RTC_CHANGE back to misc.json. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Acked-by: Greg Kurz <groug@kaod.org> Message-Id: <20220221192123.749970-2-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/misc-target.json33
-rw-r--r--qapi/misc.json22
2 files changed, 22 insertions, 33 deletions
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index 4bc45d2..036c5e4 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -3,39 +3,6 @@
#
##
-# @RTC_CHANGE:
-#
-# Emitted when the guest changes the RTC time.
-#
-# @offset: offset between base RTC clock (as specified by -rtc base), and
-# new RTC clock value
-#
-# Note: This event is rate-limited.
-#
-# Since: 0.13
-#
-# Example:
-#
-# <- { "event": "RTC_CHANGE",
-# "data": { "offset": 78 },
-# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
-#
-##
-{ 'event': 'RTC_CHANGE',
- 'data': { 'offset': 'int' },
- 'if': { 'any': [ 'TARGET_ALPHA',
- 'TARGET_ARM',
- 'TARGET_HPPA',
- 'TARGET_I386',
- 'TARGET_MIPS',
- 'TARGET_MIPS64',
- 'TARGET_PPC',
- 'TARGET_PPC64',
- 'TARGET_S390X',
- 'TARGET_SH4',
- 'TARGET_SPARC' ] } }
-
-##
# @rtc-reset-reinjection:
#
# This command will reset the RTC interrupt reinjection backlog.
diff --git a/qapi/misc.json b/qapi/misc.json
index e8054f4..7a70eaa 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -527,3 +527,25 @@
'data': { '*option': 'str' },
'returns': ['CommandLineOptionInfo'],
'allow-preconfig': true }
+
+##
+# @RTC_CHANGE:
+#
+# Emitted when the guest changes the RTC time.
+#
+# @offset: offset between base RTC clock (as specified by -rtc base), and
+# new RTC clock value
+#
+# Note: This event is rate-limited.
+#
+# Since: 0.13
+#
+# Example:
+#
+# <- { "event": "RTC_CHANGE",
+# "data": { "offset": 78 },
+# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
+#
+##
+{ 'event': 'RTC_CHANGE',
+ 'data': { 'offset': 'int' } }