ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi event: clean up in callers 

This patch improves docs and address small issues in event
callers.

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Wenchao Xia 2014-06-24 16:34:00 -07:00 committed by Luiz Capitulino
parent d6f9c82c62
commit 2f44a08b3e
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/watchdog/watchdog.c
View File

@ -106,7 +106,7 @@ int select_watchdog_action(const char *p)
*/ */
void watchdog_perform_action(void) void watchdog_perform_action(void)
{ {
switch(watchdog_action) { switch (watchdog_action) {
case WDT_RESET: /* same as 'system_reset' in monitor */ case WDT_RESET: /* same as 'system_reset' in monitor */
qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_RESET, &error_abort); qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_RESET, &error_abort);
qemu_system_reset_request(); qemu_system_reset_request();

2
include/block/blockjob.h
View File

@ -217,7 +217,7 @@ void block_job_pause(BlockJob *job);
void block_job_resume(BlockJob *job); void block_job_resume(BlockJob *job);
/** /**
* block_job_event_cancle: * block_job_event_cancelled:
* @job: The job whose information is requested. * @job: The job whose information is requested.
* *
* Send a BLOCK_JOB_CANCELLED event for the specified job. * Send a BLOCK_JOB_CANCELLED event for the specified job.

2
monitor.c
View File

@ -570,6 +570,7 @@ monitor_qapi_event_throttle(QAPIEvent event, int64_t rate)
trace_monitor_protocol_event_throttle(event, rate); trace_monitor_protocol_event_throttle(event, rate);
evstate->event = event; evstate->event = event;
assert(rate * SCALE_MS <= INT64_MAX);
evstate->rate = rate * SCALE_MS; evstate->rate = rate * SCALE_MS;
evstate->last = 0; evstate->last = 0;
evstate->data = NULL; evstate->data = NULL;
@ -585,7 +586,6 @@ static void monitor_qapi_event_init(void)
monitor_qapi_event_throttle(QAPI_EVENT_RTC_CHANGE, 1000); monitor_qapi_event_throttle(QAPI_EVENT_RTC_CHANGE, 1000);
monitor_qapi_event_throttle(QAPI_EVENT_WATCHDOG, 1000); monitor_qapi_event_throttle(QAPI_EVENT_WATCHDOG, 1000);
monitor_qapi_event_throttle(QAPI_EVENT_BALLOON_CHANGE, 1000); monitor_qapi_event_throttle(QAPI_EVENT_BALLOON_CHANGE, 1000);
/* limit the rate of quorum events to avoid hammering the management */
monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_REPORT_BAD, 1000); monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_REPORT_BAD, 1000);
monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_FAILURE, 1000); monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_FAILURE, 1000);

7
qapi-schema.json
View File

@ -657,8 +657,9 @@
# #
# @host: IP address # @host: IP address
# #
# @service: The service name of vnc port. This may depend on the host system's # @service: The service name of the vnc port. This may depend on the host
# service database so symbolic names should not be relied on. # system's service database so symbolic names should not be relied
# on.
# #
# @family: address family # @family: address family
# #
@ -697,7 +698,7 @@
## ##
{ 'type': 'VncClientInfo', { 'type': 'VncClientInfo',
'base': 'VncBasicInfo', 'base': 'VncBasicInfo',
'data': { '*x509_dname' : 'str', '*sasl_username': 'str' } } 'data': { '*x509_dname': 'str', '*sasl_username': 'str' } }
## ##
# @VncInfo: # @VncInfo:

3
qapi/block-core.json
View File

@ -1436,7 +1436,8 @@
# @device: device name # @device: device name
# #
# @msg: informative message for human consumption, such as the kind of # @msg: informative message for human consumption, such as the kind of
# corruption being detected # corruption being detected. It should not be parsed by machine as it is
# not guaranteed to be stable
# #
# @offset: #optional, if the corruption resulted from an image access, this is # @offset: #optional, if the corruption resulted from an image access, this is
# the access offset into the image # the access offset into the image

4
qapi/event.json
View File

@ -1,8 +1,8 @@
## ##
# @SHUTDOWN # @SHUTDOWN
# #
# Emitted when the virtual machine has shutdown, possibly indicating that QEMU # Emitted when the virtual machine has shut down, indicating that qemu is
# is about about to exit. # about to exit.
# #
# Note: If the command-line option "-no-shutdown" has been specified, qemu will # Note: If the command-line option "-no-shutdown" has been specified, qemu will
# not exit, and a STOP event will eventually follow the SHUTDOWN event # not exit, and a STOP event will eventually follow the SHUTDOWN event