From patchwork Thu Jan 2 23:10:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 306436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 36DF12C00A4 for ; Fri, 3 Jan 2014 18:11:40 +1100 (EST) Received: from localhost ([::1]:48438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vyyuv-0001HH-2k for incoming@patchwork.ozlabs.org; Fri, 03 Jan 2014 02:11:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VyyuR-0001Go-N6 for qemu-devel@nongnu.org; Fri, 03 Jan 2014 02:11:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VyyuG-00045N-VY for qemu-devel@nongnu.org; Fri, 03 Jan 2014 02:11:07 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:33842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VyyuE-00044u-NL for qemu-devel@nongnu.org; Fri, 03 Jan 2014 02:10:56 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Jan 2014 12:40:43 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 3 Jan 2014 12:40:41 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 62D4B1258051 for ; Fri, 3 Jan 2014 12:42:07 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s037AYB063176848 for ; Fri, 3 Jan 2014 12:40:34 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s037Aevt017510 for ; Fri, 3 Jan 2014 12:40:41 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s037Abug017206; Fri, 3 Jan 2014 12:40:39 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 3 Jan 2014 07:10:31 +0800 Message-Id: <1388704234-22498-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1388704234-22498-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1388704234-22498-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14010307-3864-0000-0000-00000BC8B27D X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.3 Cc: Wenchao Xia , mreitz@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [RFC PATCH V2 2/5] qapi: add event helper functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This file hold some functions that do not need to be generated. Signed-off-by: Wenchao Xia --- include/qapi/qmp-event.h | 22 ++++++++++++++++++ qapi/Makefile.objs | 1 + qapi/qmp-event.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) 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..2baf093 --- /dev/null +++ b/include/qapi/qmp-event.h @@ -0,0 +1,22 @@ +/* + * QMP Event related + * + * Copyright IBM, Corp. 2014 + * + * Authors: + * Wenchao Xia + * + * This work is licensed under the terms of the GNU GPLv2+ 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" + +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..dc81ec2 --- /dev/null +++ b/qapi/qmp-event.c @@ -0,0 +1,56 @@ +/* + * QMP Event related + * + * Copyright IBM, Corp. 2014 + * + * Authors: + * Wenchao Xia + * + * This work is licensed under the terms of the GNU GPLv2+ or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#include + +#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 void timestamp_put(QDict *qdict) +{ + int err; + QObject *obj; + qemu_timeval tv; + + err = qemu_gettimeofday(&tv); + if (err < 0) { + return; + } + + obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", " + "'microseconds': %" PRId64 " }", + (int64_t) tv.tv_sec, (int64_t) tv.tv_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; +}