diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-07-29 15:57:54 -0300 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2011-09-15 16:39:32 -0300 |
| commit | 6667b23f300ff08a47a73821ce2fb7f773754969 (patch) | |
| tree | 76add28b9b8049eea0cf7f1c7d711bd83314845b /qerror.c | |
| parent | 1354869c380cf4560fa3f0520e914cb5ee380ac8 (diff) | |
| download | focaccia-qemu-6667b23f300ff08a47a73821ce2fb7f773754969.tar.gz focaccia-qemu-6667b23f300ff08a47a73821ce2fb7f773754969.zip | |
Monitor/QMP: Don't allow cont on bad VM state
We have two states where issuing cont before system_reset can cause problems: RSTATE_SHUTDOWN (when -no-shutdown is used) and RSTATE_PANICKED (which only happens with kvm). This commit fixes that by doing the following when state is RSTATE_SHUTDOWN or RSTATE_PANICKED: 1. returning an error to the user/client if cont is issued 2. automatically transition to RSTATE_PAUSED during system_reset Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'qerror.c')
| -rw-r--r-- | qerror.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qerror.c b/qerror.c index 3d64b80b24..c591a5443c 100644 --- a/qerror.c +++ b/qerror.c @@ -194,6 +194,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "QMP input object member '%(member)' is unexpected", }, { + .error_fmt = QERR_RESET_REQUIRED, + .desc = "Resetting the Virtual Machine is required", + }, + { .error_fmt = QERR_SET_PASSWD_FAILED, .desc = "Could not set password", }, |