[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 4/8] qapi: rename MonitorEvent to QEvent
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [RFC PATCH 4/8] qapi: rename MonitorEvent to QEvent |
Date: |
Thu, 12 Sep 2013 17:15:08 +0800 |
Signed-off-by: Wenchao Xia <address@hidden>
---
block.c | 2 +-
include/block/block_int.h | 2 +-
include/monitor/monitor.h | 2 +-
include/qapi/qmp/qevent.h | 4 ++--
monitor.c | 12 ++++++------
stubs/mon-protocol-event.c | 2 +-
ui/vnc.c | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/block.c b/block.c
index a532eaa..07385bf 100644
--- a/block.c
+++ b/block.c
@@ -1710,7 +1710,7 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const
BlockDevOps *ops,
}
void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,
- MonitorEvent ev,
+ QEvent ev,
BlockErrorAction action, bool is_read)
{
QObject *data;
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 5de45a1..db2cb49 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -315,7 +315,7 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs);
int is_windows_drive(const char *filename);
#endif
void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,
- MonitorEvent ev,
+ QEvent ev,
BlockErrorAction action, bool is_read);
/**
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 686c0eb..97fcee3 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -22,7 +22,7 @@ extern Monitor *default_mon;
int monitor_cur_is_qmp(void);
-void monitor_protocol_event(MonitorEvent event, QObject *data);
+void monitor_protocol_event(QEvent event, QObject *data);
void monitor_init(CharDriverState *chr, int flags);
int monitor_suspend(Monitor *mon);
diff --git a/include/qapi/qmp/qevent.h b/include/qapi/qmp/qevent.h
index aef71d9..dda9511 100644
--- a/include/qapi/qmp/qevent.h
+++ b/include/qapi/qmp/qevent.h
@@ -2,7 +2,7 @@
#define QEVENT_H
/* QMP events */
-typedef enum MonitorEvent {
+typedef enum QEvent {
QEVENT_SHUTDOWN,
QEVENT_RESET,
QEVENT_POWERDOWN,
@@ -36,6 +36,6 @@ typedef enum MonitorEvent {
* defining new events here */
QEVENT_MAX,
-} MonitorEvent;
+} QEvent;
#endif
diff --git a/monitor.c b/monitor.c
index 74f3f1b..9377834 100644
--- a/monitor.c
+++ b/monitor.c
@@ -175,7 +175,7 @@ typedef struct MonitorControl {
* instance.
*/
typedef struct MonitorEventState {
- MonitorEvent event; /* Event being tracked */
+ QEvent event; /* Event being tracked */
int64_t rate; /* Period over which to throttle. 0 to disable */
int64_t last; /* Time at which event was last emitted */
QEMUTimer *timer; /* Timer for handling delayed events */
@@ -517,7 +517,7 @@ QemuMutex monitor_event_state_lock;
* Emits the event to every monitor instance
*/
static void
-monitor_protocol_event_emit(MonitorEvent event,
+monitor_protocol_event_emit(QEvent event,
QObject *data)
{
Monitor *mon;
@@ -536,7 +536,7 @@ monitor_protocol_event_emit(MonitorEvent event,
* applying any rate limiting if required.
*/
static void
-monitor_protocol_event_queue(MonitorEvent event,
+monitor_protocol_event_queue(QEvent event,
QObject *data)
{
MonitorEventState *evstate;
@@ -614,7 +614,7 @@ static void monitor_protocol_event_handler(void *opaque)
* milliseconds
*/
static void
-monitor_protocol_event_throttle(MonitorEvent event,
+monitor_protocol_event_throttle(QEvent event,
int64_t rate)
{
MonitorEventState *evstate;
@@ -650,7 +650,7 @@ static void monitor_protocol_event_init(void)
*
* Event-specific data can be emitted through the (optional) 'data' parameter.
*/
-void monitor_protocol_event(MonitorEvent event, QObject *data)
+void monitor_protocol_event(QEvent event, QObject *data)
{
QDict *qmp;
const char *event_name;
@@ -1067,7 +1067,7 @@ CommandInfoList *qmp_query_commands(Error **errp)
EventInfoList *qmp_query_events(Error **errp)
{
EventInfoList *info, *ev_list = NULL;
- MonitorEvent e;
+ QEvent e;
for (e = 0 ; e < QEVENT_MAX ; e++) {
const char *event_name = monitor_event_names[e];
diff --git a/stubs/mon-protocol-event.c b/stubs/mon-protocol-event.c
index 0946e94..e769729 100644
--- a/stubs/mon-protocol-event.c
+++ b/stubs/mon-protocol-event.c
@@ -1,6 +1,6 @@
#include "qemu-common.h"
#include "monitor/monitor.h"
-void monitor_protocol_event(MonitorEvent event, QObject *data)
+void monitor_protocol_event(QEvent event, QObject *data)
{
}
diff --git a/ui/vnc.c b/ui/vnc.c
index 5601cc3..47fda54 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -275,7 +275,7 @@ static void vnc_client_cache_addr(VncState *client)
client->info = QOBJECT(qdict);
}
-static void vnc_qmp_event(VncState *vs, MonitorEvent event)
+static void vnc_qmp_event(VncState *vs, QEvent event)
{
QDict *server;
QObject *data;
--
1.7.1
- [Qemu-devel] [RFC PATCH 0/8] Remove stub mon-protocol-event for block, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 1/8] block: use type MonitorEvent directly, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 2/8] block: do not include monitor.h in block.c, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 4/8] qapi: rename MonitorEvent to QEvent,
Wenchao Xia <=
- [Qemu-devel] [RFC PATCH 3/8] qapi: move MonitorEvent define, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 8/8] stubs: remove mon-protocol-event.o in stub obj, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 6/8] block: replace monitor_protocol_event() with callback, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 7/8] block: do not include monitor.h, Wenchao Xia, 2013/09/12
- [Qemu-devel] [RFC PATCH 5/8] block: add a callback layer for common functions, Wenchao Xia, 2013/09/12
- Re: [Qemu-devel] [RFC PATCH 0/8] Remove stub mon-protocol-event for block, Paolo Bonzini, 2013/09/12