[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/17] qapi: move RTC_CHANGE to the target schema
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 17/17] qapi: move RTC_CHANGE to the target schema |
Date: |
Wed, 6 Feb 2019 19:17:25 +0100 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ppc/spapr_rtc.c | 2 +-
hw/timer/mc146818rtc.c | 2 +-
qapi/misc.json | 23 -----------------------
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
@@ -2876,29 +2876,6 @@
{ 'event': 'ACPI_DEVICE_OST',
'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:
#
diff --git a/qapi/target.json b/qapi/target.json
index 5c41a0aee7..da7b4be51e 100644
--- a/qapi/target.json
+++ b/qapi/target.json
@@ -7,6 +7,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:
#
--
2.17.2
- [Qemu-devel] [PATCH v3 13/17] qapi: make query-cpu-definitions depend on specific targets, (continued)
- [Qemu-devel] [PATCH v3 13/17] qapi: make query-cpu-definitions depend on specific targets, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 04/17] qapi: Prepare for system modules other than 'builtin', Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 09/17] qapi: make s390 commands depend on TARGET_S390X, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 10/17] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 03/17] qapi: Clean up modular built-in code generation a bit, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 16/17] qmp: Deprecate query-events in favor of query-qmp-schema, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 17/17] qapi: move RTC_CHANGE to the target schema,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 08/17] qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386, Markus Armbruster, 2019/02/06