Re: [Qemu-devel] [PATCH 2.1 03/36] qapi: add event helper functions

[Wenchao Xia]

于 2014/6/18 14:43, Paolo Bonzini 写道:
> From: Wenchao Xia <address@hidden>
> 
> This file holds some functions that do not need to be generated.
> 
> Signed-off-by: Wenchao Xia <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>   include/qapi/qmp-event.h | 27 ++++++++++++++++++
>   qapi/Makefile.objs       |  1 +
>   qapi/qmp-event.c         | 74 
> ++++++++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 102 insertions(+)
>   create mode 100644 include/qapi/qmp-event.h
>   create mode 100644 qapi/qmp-event.c
> 
> diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h
> new file mode 100644
> index 0000000..8a8ffb5
> --- /dev/null
> +++ b/include/qapi/qmp-event.h
> @@ -0,0 +1,27 @@
> +/*
> + * QMP Event related
> + *
> + * Copyright (c) 2014 Wenchao Xia
> + *
> + * Authors:
> + *  Wenchao Xia   <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.1 or 
> later.
> + * See the COPYING.LIB file in the top-level directory.
> + *
> + */
> +
> +#ifndef QMP_EVENT_H
> +#define QMP_EVENT_H
> +
> +#include "qapi/error.h"
> +#include "qapi/qmp/qdict.h"
> +
> +typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp);
> +

  Using unsigned instead of QAPIEvent works around the include issue,
and also fix the type cast issue in implemention function that Eric
mentioned. It is nice to me, +1.

> +void qmp_event_set_func_emit(QMPEventFuncEmit emit);
> +
> +QMPEventFuncEmit qmp_event_get_func_emit(void);
> +
> +QDict *qmp_event_build_dict(const char *event_name);
> +#endif
> diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
> index 1f9c973..d14b769 100644
> --- a/qapi/Makefile.objs
> +++ b/qapi/Makefile.objs
> @@ -3,3 +3,4 @@ util-obj-y += qmp-output-visitor.o qmp-registry.o 
> qmp-dispatch.o
>   util-obj-y += string-input-visitor.o string-output-visitor.o
>   
>   util-obj-y += opts-visitor.o
> +util-obj-y += qmp-event.o
> diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
> new file mode 100644
> index 0000000..0d1ce0b
> --- /dev/null
> +++ b/qapi/qmp-event.c
> @@ -0,0 +1,74 @@
> +/*
> + * QMP Event related
> + *
> + * Copyright (c) 2014 Wenchao Xia
> + *
> + * Authors:
> + *  Wenchao Xia   <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.1 or 
> later.
> + * See the COPYING.LIB file in the top-level directory.
> + *
> + */
> +
> +#include <inttypes.h>
> +
> +#include "qemu-common.h"
> +#include "qapi/qmp-event.h"
> +#include "qapi/qmp/qstring.h"
> +#include "qapi/qmp/qjson.h"
> +
> +#ifdef _WIN32
> +#include "sysemu/os-win32.h"
> +#endif
> +
> +#ifdef CONFIG_POSIX
> +#include "sysemu/os-posix.h"
> +#endif
> +
> +static QMPEventFuncEmit qmp_emit;
> +
> +void qmp_event_set_func_emit(QMPEventFuncEmit emit)
> +{
> +    qmp_emit = emit;
> +}
> +
> +QMPEventFuncEmit qmp_event_get_func_emit(void)
> +{
> +    return qmp_emit;
> +}
> +
> +static void timestamp_put(QDict *qdict)
> +{
> +    int err;
> +    QObject *obj;
> +    qemu_timeval tv;
> +    int64_t sec, usec;
> +
> +    err = qemu_gettimeofday(&tv);
> +    if (err < 0) {
> +        /* Put -1 to indicate failure of getting host time */
> +        sec = -1;
> +        usec = -1;
> +    } else {
> +        sec = tv.tv_sec;
> +        usec = tv.tv_usec;
> +    }
> +
> +    obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
> +                             "'microseconds': %" PRId64 " }",
> +                             sec, usec);
> +    qdict_put_obj(qdict, "timestamp", obj);
> +}
> +
> +/*
> + * Build a QDict, then fill event name and time stamp, caller should free the
> + * QDict after usage.
> + */
> +QDict *qmp_event_build_dict(const char *event_name)
> +{
> +    QDict *dict = qdict_new();
> +    qdict_put(dict, "event", qstring_from_str(event_name));
> +    timestamp_put(dict);
> +    return dict;
> +}
>