Commit 14d53b4f authored by Michal Privoznik's avatar Michal Privoznik Committed by Markus Armbruster
Browse files

qapi: Rename WatchdogExpirationAction enum 



The new name is WatchdogAction which is shorter,

Signed-off-by: default avatarMichal Privoznik <mprivozn@redhat.com>
Message-Id: <dbd61a0928821348486d0d6260be2bd3b02b6402.1504771369.git.mprivozn@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent ab161529

hw/watchdog/watchdog.c

+7 −7
Original line number Diff line number Diff line
@@ -109,17 +109,17 @@ void watchdog_perform_action(void) 
{

    switch (watchdog_action) {

    case WDT_RESET:             /* same as 'system_reset' in monitor */

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_RESET, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_RESET, &error_abort);

        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

        break;



    case WDT_SHUTDOWN:          /* same as 'system_powerdown' in monitor */

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_SHUTDOWN, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_SHUTDOWN, &error_abort);

        qemu_system_powerdown_request();

        break;



    case WDT_POWEROFF:          /* same as 'quit' command in monitor */

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_POWEROFF, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_POWEROFF, &error_abort);

        exit(0);



    case WDT_PAUSE:             /* same as 'stop' command in monitor */
@@ -127,21 +127,21 @@ void watchdog_perform_action(void) 
         * you would get a deadlock.  Bypass the problem.

         */

        qemu_system_vmstop_request_prepare();

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_PAUSE, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_PAUSE, &error_abort);

        qemu_system_vmstop_request(RUN_STATE_WATCHDOG);

        break;



    case WDT_DEBUG:

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_DEBUG, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_DEBUG, &error_abort);

        fprintf(stderr, "watchdog: timer fired\n");

        break;



    case WDT_NONE:

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_NONE, &error_abort);

        qapi_event_send_watchdog(WATCHDOG_ACTION_NONE, &error_abort);

        break;



    case WDT_NMI:

        qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_INJECT_NMI,

        qapi_event_send_watchdog(WATCHDOG_ACTION_INJECT_NMI,

                                 &error_abort);

        nmi_monitor_handle(0, NULL);

        break;

monitor.c

+2 −2
Original line number Diff line number Diff line
@@ -3541,8 +3541,8 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) 
        return;

    }

    readline_set_completion_index(rs, strlen(str));

    for (i = 0; i < WATCHDOG_EXPIRATION_ACTION__MAX; i++) {

        add_completion_option(rs, str, WatchdogExpirationAction_str(i));

    for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {

        add_completion_option(rs, str, WatchdogAction_str(i));

    }

}

qapi/run-state.json

+3 −3
Original line number Diff line number Diff line
@@ -253,10 +253,10 @@ 
#

##

{ 'event': 'WATCHDOG',

  'data': { 'action': 'WatchdogExpirationAction' } }

  'data': { 'action': 'WatchdogAction' } }



##

# @WatchdogExpirationAction:

# @WatchdogAction:

#

# An enumeration of the actions taken when the watchdog device's timer is

# expired
@@ -279,7 +279,7 @@ 
#

# Since: 2.1

##

{ 'enum': 'WatchdogExpirationAction',

{ 'enum': 'WatchdogAction',

  'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none',

            'inject-nmi' ] }