diff options
| author | Stefan Hajnoczi | 2016-11-18 12:05:48 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-11-18 12:05:48 +0100 |
| commit | 363effe28b188460f8a0b075b841fdca1b2043d4 (patch) | |
| tree | e61845188742ff93e0d16226947b63fe9ca1d290 | |
| parent | pc: fix FW_CFG_NB_CPUS to account for -device added CPUs (diff) | |
| parent | qapi-schema: clarify 'colo' state for MigrationStatus (diff) | |
| download | qemu-363effe28b188460f8a0b075b841fdca1b2043d4.tar.gz qemu-363effe28b188460f8a0b075b841fdca1b2043d4.tar.xz qemu-363effe28b188460f8a0b075b841fdca1b2043d4.zip | |
Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging
# gpg: Signature made Thu 17 Nov 2016 10:18:58 AM GMT
# gpg: using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* vivier/tags/trivial-patches-pull-request:
qapi-schema: clarify 'colo' state for MigrationStatus
Message-id: 1479378016-19022-1-git-send-email-laurent@vivier.eu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | qapi-schema.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index b0b4bf64cc..f3e9bfc510 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -176,8 +176,9 @@ # # @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) +# @colo: guest is paused to save/restore VM state under colo checkpoint, +# VM can not get into this state unless colo capability is enabled +# for migration. (since 2.8) ## { 'enum': 'RunState', 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', @@ -462,7 +463,8 @@ # # @failed: some error occurred during migration process. # -# @colo: VM is in the process of fault tolerance. (since 2.8) +# @colo: VM is in the process of fault tolerance, VM can not get into this +# state unless colo capability is enabled for migration. (since 2.8) # # Since: 2.3 # |