Message ID | 20220221192123.749970-2-peter.maydell@linaro.org |
---|---|
State | Accepted |
Headers | show |
Series | qapi: Move RTC_CHANGE back out of target schema | expand |
On 21/2/22 20:21, Peter Maydell wrote: > 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> > --- > qapi/misc-target.json | 33 --------------------------------- > qapi/misc.json | 22 ++++++++++++++++++++++ > hw/ppc/spapr_rtc.c | 2 +- > hw/rtc/mc146818rtc.c | 2 +- > hw/rtc/pl031.c | 2 +- > 5 files changed, 25 insertions(+), 36 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 4bc45d24741..036c5e4a914 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -2,39 +2,6 @@ # vim: filetype=python # -## -# @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: # diff --git a/qapi/misc.json b/qapi/misc.json index e8054f415b2..7a70eaa3ffc 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' } } diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 94a5510e4eb..79677cf5503 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -32,7 +32,7 @@ #include "hw/ppc/spapr.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" #include "qemu/cutils.h" #include "qemu/module.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index e61a0cced4c..57c514e15c5 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -40,7 +40,7 @@ #include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" #include "hw/rtc/mc146818rtc_regs.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 38d9d3c2f38..60167c778f2 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" #define RTC_DR 0x00 /* Data read register */ #define RTC_MR 0x04 /* Match register */