@@ -1759,7 +1759,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;
@@ -337,7 +337,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);
/**
@@ -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);
@@ -27,7 +27,7 @@
#define QEVENT_H
/* QMP events */
-typedef enum MonitorEvent {
+typedef enum QEvent {
QEVENT_SHUTDOWN,
QEVENT_RESET,
QEVENT_POWERDOWN,
@@ -61,6 +61,6 @@ typedef enum MonitorEvent {
* defining new events here */
QEVENT_MAX,
-} MonitorEvent;
+} QEvent;
#endif
@@ -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];
@@ -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)
{
}
@@ -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;