OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

-----BEGIN PGP SIGNATURE----- 

iQIcBAABAgAGBQJYLYQSAAoJEPMMOL0/L748ogsP/2e1fZBsm6TTfGtVnT0KvyEi
 vqWvWRQoXMHVWpjGTFyjMSp0c9ogQTmqLp77znlOyO/veKsjamow/UUksiRVnHSu
 aWvP9H+9rB2bLSWSaQvHyD8BMsCq0rfnhPq+wyRUPmR33X6/jlDwWHxRPXdnEApl
 rgzqvOgivfjk0KJjY4iwoOnBYtyEzVB/WgZD6ssK9DKeU2Vxg+NCk8im9N58Qpv8
 ffUypDQ7FiS+wmLtazp0Iks7AFSTkGsdtJ/bMJOqkj2CLUwdx5sP1KLMnwKfsPK6
 mfvXaXnd2x2Q11EgQv8CWJS8GtiNHW9hTvgKM3p5xB0yV5/bXIk/tGETYIgEkOWC
 gRMZFaG/U8ztyWUZ7W7P0s/YHbZx1/OsGubB6Z3eEHa/WLAB0aoCHGESGFb0KqsD
 EjMY1fe9c4pSE0MtGD+Byy3WMkn+Iki9Ewc2KLjR0v9IRT3+LgIto087aONMN6AS
 KOle/l32OEX+UIgvLn5Xh5adyhcI0m0elVPFfdwsv/XIjIx6jSePKJ8uShs5p3oO
 HHMEEmEtudxw0bEa3XboVVvGNQAA364/BPCULAoVEYiDnB1scS1z9YQNm0NpCC/p
 wQKVPVV29u5Y+1KFxqf0laOqkVtVluRlbADrQcktfneHkFz96/U38U7QU62ZtXh1
 /28TbRGeBetMRDQ9xz4c
 =GHnD
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Stefan Hajnoczi 2016-11-18 11:05:48 +00:00
parent e3cadac073 252093a726
commit 363effe28b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qapi-schema.json
View File

@ -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
#