lkml.org 
[lkml]   [2012]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/6 v7] add a new runstate: RUN_STATE_GUEST_PANICKED
    The guest will be in this state when it is panicked.

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    ---
    qapi-schema.json | 6 +++++-
    qmp.c | 3 ++-
    vl.c | 7 ++++++-
    3 files changed, 13 insertions(+), 3 deletions(-)

    diff --git a/qapi-schema.json b/qapi-schema.json
    index a92adb1..5889af7 100644
    --- a/qapi-schema.json
    +++ b/qapi-schema.json
    @@ -119,11 +119,15 @@
    # @suspended: guest is suspended (ACPI S3)
    #
    # @watchdog: the watchdog action is configured to pause and has been triggered
    +#
    +# @guest-panicked: the panicked action is configured to pause and has been
    +# triggered.
    ##
    { 'enum': 'RunState',
    'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
    'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
    - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog' ] }
    + 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',
    + 'guest-panicked' ] }

    ##
    # @StatusInfo:
    diff --git a/qmp.c b/qmp.c
    index a111dff..3b0c9bc 100644
    --- a/qmp.c
    +++ b/qmp.c
    @@ -148,7 +148,8 @@ void qmp_cont(Error **errp)
    error_set(errp, QERR_MIGRATION_EXPECTED);
    return;
    } else if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
    - runstate_check(RUN_STATE_SHUTDOWN)) {
    + runstate_check(RUN_STATE_SHUTDOWN) ||
    + runstate_check(RUN_STATE_GUEST_PANICKED)) {
    error_set(errp, QERR_RESET_REQUIRED);
    return;
    } else if (runstate_check(RUN_STATE_SUSPENDED)) {
    diff --git a/vl.c b/vl.c
    index c7cee31..5e33c97 100644
    --- a/vl.c
    +++ b/vl.c
    @@ -361,6 +361,7 @@ static const RunStateTransition runstate_transitions_def[] = {
    { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM },
    { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
    { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },
    + { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },

    { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },

    @@ -375,6 +376,9 @@ static const RunStateTransition runstate_transitions_def[] = {
    { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
    { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },

    + { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING },
    + { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
    +
    { RUN_STATE_MAX, RUN_STATE_MAX },
    };

    @@ -1531,7 +1535,8 @@ static bool main_loop_should_exit(void)
    qemu_system_reset(VMRESET_REPORT);
    resume_all_vcpus();
    if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
    - runstate_check(RUN_STATE_SHUTDOWN)) {
    + runstate_check(RUN_STATE_SHUTDOWN) ||
    + runstate_check(RUN_STATE_GUEST_PANICKED)) {
    bdrv_iterate(iostatus_bdrv_it, NULL);
    vm_start();
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2012-07-21 10:01    [W:0.027 / U:61.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site