diff options
| author | Marc-André Lureau | 2019-02-14 16:22:51 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2019-02-18 14:44:05 +0100 |
| commit | 183e4281a30962729b760dfe8bed5aab27238b0c (patch) | |
| tree | 0b736465bb7b583e5d538c9cd720aac5814be19a | |
| parent | qmp: Deprecate query-events in favor of query-qmp-schema (diff) | |
| download | qemu-183e4281a30962729b760dfe8bed5aab27238b0c.tar.gz qemu-183e4281a30962729b760dfe8bed5aab27238b0c.tar.xz qemu-183e4281a30962729b760dfe8bed5aab27238b0c.zip | |
qapi: move RTC_CHANGE to the target schema
A few targets don't emit RTC_CHANGE, we could restrict the event to
the tagets that do emit it.
Note: There is a lot more of events & commands that we could restrict
to capable targets, with the cost of some additional complexity, but
the benefit of added correctness and better introspection.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190214152251.2073-19-armbru@redhat.com>
| -rw-r--r-- | hw/ppc/spapr_rtc.c | 2 | ||||
| -rw-r--r-- | hw/timer/mc146818rtc.c | 2 | ||||
| -rw-r--r-- | qapi/misc.json | 23 | ||||
| -rw-r--r-- | qapi/target.json | 23 |
4 files changed, 25 insertions, 25 deletions
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index cd049f389d..eb95a7077d 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -31,7 +31,7 @@ #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" #include "qapi/error.h" -#include "qapi/qapi-events-misc.h" +#include "qapi/qapi-events-target.h" #include "qemu/cutils.h" void spapr_rtc_read(sPAPRRTCState *rtc, struct tm *tm, uint32_t *ns) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index bc1862b6fc..513f105e62 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -32,7 +32,7 @@ #include "hw/timer/mc146818rtc.h" #include "qapi/error.h" #include "qapi/qapi-commands-target.h" -#include "qapi/qapi-events-misc.h" +#include "qapi/qapi-events-target.h" #include "qapi/visitor.h" #include "exec/address-spaces.h" diff --git a/qapi/misc.json b/qapi/misc.json index 98f59f828a..8b3ca4fdd3 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2877,29 +2877,6 @@ 'data': { 'info': 'ACPIOSTInfo' } } ## -# @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 that value will be different depending -# on clock chosen to drive RTC (specified by -rtc clock). -# -# Note: This event is rate-limited. -# -# Since: 0.13.0 -# -# Example: -# -# <- { "event": "RTC_CHANGE", -# "data": { "offset": 78 }, -# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } -# -## -{ 'event': 'RTC_CHANGE', - 'data': { 'offset': 'int' } } - -## # @ReplayMode: # # Mode of the replay subsystem. diff --git a/qapi/target.json b/qapi/target.json index 5c41a0aee7..da7b4be51e 100644 --- a/qapi/target.json +++ b/qapi/target.json @@ -8,6 +8,29 @@ { 'include': 'misc.json' } ## +# @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.0 +# +# Example: +# +# <- { "event": "RTC_CHANGE", +# "data": { "offset": 78 }, +# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } +# +## +{ 'event': 'RTC_CHANGE', + 'data': { 'offset': 'int' }, + 'if': 'defined(TARGET_ALPHA) || defined(TARGET_ARM) || defined(TARGET_HPPA) || defined(TARGET_I386) || defined(TARGET_MIPS) || defined(TARGET_MIPS64) || defined(TARGET_MOXIE) || defined(TARGET_PPC) || defined(TARGET_PPC64) || defined(TARGET_S390X) || defined(TARGET_SH4) || defined(TARGET_SPARC)' } + +## # @rtc-reset-reinjection: # # This command will reset the RTC interrupt reinjection backlog. |