From: Marc-André Lureau <[email protected]> Define a StructTm QAPI struct in common.json matching the existing "struct tm" property wire format (tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec as int32).
Convert the two callers (mc146818rtc and spapr_rtc) to pass its QAPITypeInfo to object_class_property_add() / object_property_add(), and use a standard ObjectPropertyAccessor that populates a StructTm and calls the generated visitor. Remove object_property_add_tm(), object_class_property_add_tm(), the TMProperty type, and the property_get_tm() helper from qom/object.c, along with their declarations in object.h. Reviewed-by: Amit Machhiwal <[email protected]> Signed-off-by: Marc-André Lureau <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> --- qapi/common.json | 27 +++++++++++++++++ qapi/pragma.json | 1 + include/qom/object.h | 29 ------------------ hw/ppc/spapr_rtc.c | 25 ++++++++++++++-- hw/rtc/mc146818rtc.c | 23 +++++++++++++-- qom/object.c | 70 -------------------------------------------- 6 files changed, 70 insertions(+), 105 deletions(-) diff --git a/qapi/common.json b/qapi/common.json index 1352e664b2..68b649ecf2 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -218,3 +218,30 @@ ## { 'enum': 'EndianMode', 'data': [ 'unspecified', 'little', 'big' ] } + +## +# @StructTm: +# Broken-down time. Field semantics match C ``struct tm``. +# +# @tm_year: years since 1900 +# +# @tm_mon: months since January (0-11) +# +# @tm_mday: day of the month (1-31) +# +# @tm_hour: hours since midnight (0-23) +# +# @tm_min: minutes after the hour (0-59) +# +# @tm_sec: seconds after the minute (0-59, 60-61 for leap seconds) +# +# Since: 11.2 +## +{ 'struct': 'StructTm', + 'data': { + 'tm_year': 'int32', + 'tm_mon': 'int32', + 'tm_mday': 'int32', + 'tm_hour': 'int32', + 'tm_min': 'int32', + 'tm_sec': 'int32' } } diff --git a/qapi/pragma.json b/qapi/pragma.json index 342cedc42e..9be2819a46 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -109,6 +109,7 @@ 'QKeyCode', # send-key, input-sent-event 'QapiErrorClass', # QMP error replies 'SshHostKeyCheckMode', # blockdev-add, -blockdev + 'StructTm', # qom-get of RTC date property 'SysEmuTarget', # query-cpu-fast, query-target 'UuidInfo', # query-uuid 'VncClientInfo', # query-vnc, query-vnc-servers, ... diff --git a/include/qom/object.h b/include/qom/object.h index e9a67017fa..d1699964fa 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -2027,35 +2027,6 @@ ObjectProperty *object_class_property_add_enum(ObjectClass *klass, int (*get)(Object *, Error **), void (*set)(Object *, int, Error **)); -/** - * object_property_add_tm: - * @obj: the object to add a property to - * @name: the name of the property - * @get: the getter or NULL if the property is write-only. - * - * Add a read-only struct tm valued property using a getter function. - * This function will add a property of type 'struct tm'. - * - * Returns: The newly added property on success, or %NULL on failure. - */ -ObjectProperty *object_property_add_tm(Object *obj, const char *name, - void (*get)(Object *, struct tm *, Error **)); - -/** - * object_class_property_add_tm: - * @klass: the object class to add a property to - * @name: the name of the property - * @get: the getter or NULL if the property is write-only. - * - * Add a read-only struct tm valued property using a getter function. - * This function will add a property of type 'struct tm'. - * - * Returns: The newly added property on success, or %NULL on failure. - */ -ObjectProperty *object_class_property_add_tm(ObjectClass *klass, - const char *name, - void (*get)(Object *, struct tm *, Error **)); - typedef enum { /* Automatically add a getter to the property */ OBJ_PROP_FLAG_READ = 1 << 0, diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 1f7d2d8f89..10d4cddb42 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -33,6 +33,9 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-events-misc.h" +#include "qapi/qapi-type-infos-common.h" +#include "qapi/qapi-visit-common.h" +#include "qapi/visitor.h" #include "qemu/cutils.h" #include "qemu/module.h" @@ -131,9 +134,23 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, SpaprMachineState *spapr, rtas_st(rets, 0, RTAS_OUT_SUCCESS); } -static void spapr_rtc_qom_date(Object *obj, struct tm *current_tm, Error **errp) +static void spapr_rtc_qom_date(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { - spapr_rtc_read(SPAPR_RTC(obj), current_tm, NULL); + struct tm value; + StructTm tm, *tmp = &tm; + + spapr_rtc_read(SPAPR_RTC(obj), &value, NULL); + + tm = (StructTm) { + .tm_year = value.tm_year, + .tm_mon = value.tm_mon, + .tm_mday = value.tm_mday, + .tm_hour = value.tm_hour, + .tm_min = value.tm_min, + .tm_sec = value.tm_sec, + }; + visit_type_StructTm(v, name, &tmp, errp); } static void spapr_rtc_realize(DeviceState *dev, Error **errp) @@ -150,7 +167,9 @@ static void spapr_rtc_realize(DeviceState *dev, Error **errp) rtc_ns = qemu_clock_get_ns(rtc_clock); rtc->ns_offset = host_s * NANOSECONDS_PER_SECOND - rtc_ns; - object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date); + object_property_add(OBJECT(rtc), "date", "struct tm", + &StructTm_type_info, + spapr_rtc_qom_date, NULL, NULL, NULL); } static const VMStateDescription vmstate_spapr_rtc = { diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index ba396435d1..835684abce 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -42,6 +42,8 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-events-misc.h" +#include "qapi/qapi-type-infos-common.h" +#include "qapi/qapi-visit-common.h" #include "qapi/visitor.h" #include "trace.h" @@ -854,12 +856,25 @@ static const MemoryRegionOps cmos_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static void rtc_get_date(Object *obj, struct tm *current_tm, Error **errp) +static void rtc_get_date(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { MC146818RtcState *s = MC146818_RTC(obj); + struct tm value; + StructTm tm, *tmp = &tm; rtc_update_time(s); - rtc_get_time(s, current_tm); + rtc_get_time(s, &value); + + tm = (StructTm) { + .tm_year = value.tm_year, + .tm_mon = value.tm_mon, + .tm_mday = value.tm_mday, + .tm_hour = value.tm_hour, + .tm_min = value.tm_min, + .tm_sec = value.tm_sec, + }; + visit_type_StructTm(v, name, &tmp, errp); } static void rtc_realizefn(DeviceState *dev, Error **errp) @@ -1019,7 +1034,9 @@ static void rtc_class_initfn(ObjectClass *klass, const void *data) device_class_set_props(dc, mc146818rtc_properties); set_bit(DEVICE_CATEGORY_MISC, dc->categories); - object_class_property_add_tm(klass, "date", rtc_get_date); + object_class_property_add(klass, "date", "struct tm", + &StructTm_type_info, + rtc_get_date, NULL, NULL, NULL); } static const TypeInfo mc146818rtc_info = { diff --git a/qom/object.c b/qom/object.c index 39d26a17c6..637459c2b1 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2613,76 +2613,6 @@ int object_property_get_enum(Object *obj, const char *name, return ret; } -typedef struct TMProperty { - void (*get)(Object *, struct tm *, Error **); -} TMProperty; - -static void property_get_tm(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - TMProperty *prop = opaque; - Error *err = NULL; - struct tm value; - - prop->get(obj, &value, &err); - if (err) { - error_propagate(errp, err); - return; - } - - if (!visit_start_struct(v, name, NULL, 0, errp)) { - return; - } - if (!visit_type_int32(v, "tm_year", &value.tm_year, errp)) { - goto out_end; - } - if (!visit_type_int32(v, "tm_mon", &value.tm_mon, errp)) { - goto out_end; - } - if (!visit_type_int32(v, "tm_mday", &value.tm_mday, errp)) { - goto out_end; - } - if (!visit_type_int32(v, "tm_hour", &value.tm_hour, errp)) { - goto out_end; - } - if (!visit_type_int32(v, "tm_min", &value.tm_min, errp)) { - goto out_end; - } - if (!visit_type_int32(v, "tm_sec", &value.tm_sec, errp)) { - goto out_end; - } - visit_check_struct(v, errp); -out_end: - visit_end_struct(v, NULL); -} - -ObjectProperty * -object_property_add_tm(Object *obj, const char *name, - void (*get)(Object *, struct tm *, Error **)) -{ - TMProperty *prop = g_malloc0(sizeof(*prop)); - - prop->get = get; - - return object_property_add(obj, name, "struct tm", NULL, - get ? property_get_tm : NULL, NULL, - property_release_data, - prop); -} - -ObjectProperty * -object_class_property_add_tm(ObjectClass *klass, const char *name, - void (*get)(Object *, struct tm *, Error **)) -{ - TMProperty *prop = g_malloc0(sizeof(*prop)); - - prop->get = get; - - return object_class_property_add(klass, name, "struct tm", NULL, - get ? property_get_tm : NULL, - NULL, NULL, prop); -} - static char *object_get_type(Object *obj, Error **errp) { return g_strdup(object_get_typename(obj)); -- 2.55.0
