Commit 21142ba7 authored by zhanghailiang's avatar zhanghailiang Committed by Amit Shah
Browse files

COLO: Add a new RunState RUN_STATE_COLO 



Guest will enter this state when paused to save/restore VM state
under COLO checkpoint.

Cc: Eric Blake <eblake@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarzhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: default avatarLi Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarAmit Shah <amit@amitshah.net>
parent 4f97558e

qapi-schema.json

+4 −1
Original line number Diff line number Diff line
@@ -175,12 +175,15 @@ 
# @watchdog: the watchdog action is configured to pause and has been triggered

#

# @guest-panicked: guest has been panicked as a result of guest OS panic

#

# @colo: guest is paused to save/restore VM state under colo checkpoint (since

# 2.8)

##

{ 'enum': 'RunState',

  'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',

            'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',

            'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',

            'guest-panicked' ] }

            'guest-panicked', 'colo' ] }



##

# @StatusInfo:

vl.c

+8 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ static const RunStateTransition runstate_transitions_def[] = { 
    { RUN_STATE_INMIGRATE, RUN_STATE_FINISH_MIGRATE },

    { RUN_STATE_INMIGRATE, RUN_STATE_PRELAUNCH },

    { RUN_STATE_INMIGRATE, RUN_STATE_POSTMIGRATE },

    { RUN_STATE_INMIGRATE, RUN_STATE_COLO },



    { RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },

    { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
@@ -626,6 +627,7 @@ static const RunStateTransition runstate_transitions_def[] = { 
    { RUN_STATE_PAUSED, RUN_STATE_RUNNING },

    { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },

    { RUN_STATE_PAUSED, RUN_STATE_PRELAUNCH },

    { RUN_STATE_PAUSED, RUN_STATE_COLO},



    { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },

    { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE },
@@ -638,10 +640,13 @@ static const RunStateTransition runstate_transitions_def[] = { 
    { RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },

    { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },

    { RUN_STATE_FINISH_MIGRATE, RUN_STATE_PRELAUNCH },

    { RUN_STATE_FINISH_MIGRATE, RUN_STATE_COLO},



    { RUN_STATE_RESTORE_VM, RUN_STATE_RUNNING },

    { RUN_STATE_RESTORE_VM, RUN_STATE_PRELAUNCH },



    { RUN_STATE_COLO, RUN_STATE_RUNNING },



    { RUN_STATE_RUNNING, RUN_STATE_DEBUG },

    { RUN_STATE_RUNNING, RUN_STATE_INTERNAL_ERROR },

    { RUN_STATE_RUNNING, RUN_STATE_IO_ERROR },
@@ -652,6 +657,7 @@ static const RunStateTransition runstate_transitions_def[] = { 
    { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },

    { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },

    { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },

    { RUN_STATE_RUNNING, RUN_STATE_COLO},



    { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
@@ -664,10 +670,12 @@ static const RunStateTransition runstate_transitions_def[] = { 
    { RUN_STATE_SUSPENDED, RUN_STATE_RUNNING },

    { RUN_STATE_SUSPENDED, RUN_STATE_FINISH_MIGRATE },

    { RUN_STATE_SUSPENDED, RUN_STATE_PRELAUNCH },

    { RUN_STATE_SUSPENDED, RUN_STATE_COLO},



    { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },

    { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },

    { RUN_STATE_WATCHDOG, RUN_STATE_PRELAUNCH },

    { RUN_STATE_WATCHDOG, RUN_STATE_COLO},



    { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING },

    { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },