@@ -3868,7 +3868,7 @@
# !end texinfo
##
{ 'option': '--watchdog-action',
- 'data': 'str', # FIXME enum
+ 'data': 'WatchdogAction',
'help': [
"-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none",
" action when watchdog fires [default=reset]"] }
@@ -3724,11 +3724,8 @@ int main(int argc, char **argv, char **envp)
watchdog = qopt[i].u.watchdog.data;
break;
case QAPI_OPTION_KIND_WATCHDOG_ACTION:
- if (select_watchdog_action(qopt[i].u.watchdog_action.data)
- == -1) {
- error_report("unknown -watchdog-action parameter");
- exit(1);
- }
+ qmp_watchdog_set_action(qopt[i].u.watchdog_action.data,
+ &error_abort);
break;
case QAPI_OPTION_KIND_VIRTIOCONSOLE:
add_device_config(DEV_VIRTCON, qopt[i].u.virtioconsole.data);
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qapi/options.json | 2 +- vl.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-)