openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

watchdog: Allow setting action on the fly 

Currently, the only time that users can set watchdog action is at
the start as all we expose is this -watchdog-action command line
argument. This is suboptimal when users want to plug the device
later via monitor. Alternatively, they might want to change the
action for already existing device on the fly.

Inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=1447169

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Message-Id: <35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
[Missing colon in doc comment fixed]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Michal Privoznik 2017-09-07 10:05:26 +02:00 committed by Markus Armbruster
parent 4c7f4426c4
commit f0df84c6c4
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/watchdog/watchdog.c
View File

@ -29,6 +29,7 @@
#include "qapi-event.h"
#include "hw/nmi.h"
#include "qemu/help_option.h"
#include "qmp-commands.h"
static WatchdogAction watchdog_action = WATCHDOG_ACTION_RESET;
static QLIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;
@ -85,7 +86,7 @@ int select_watchdog_action(const char *p)
g_free(qapi_value);
if (action < 0)
return -1;
watchdog_action = action;
qmp_watchdog_set_action(action, &error_abort);
return 0;
}
@ -142,3 +143,8 @@ void watchdog_perform_action(void)
assert(0);
}
}
void qmp_watchdog_set_action(WatchdogAction action, Error **errp)
{
watchdog_action = action;
}

9
qapi-schema.json
View File

@ -3191,3 +3191,12 @@
# Since 2.9
##
{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
##
# @watchdog-set-action:
#
# Set watchdog action
#
# Since: 2.11
##
{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }