diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-02 09:49:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-02 09:49:35 +0000 |
| commit | 4cb890b858bd1bd5935457401630d95754c4be48 (patch) | |
| tree | aa93a8e835dcfbb4735f5f88b8d31246cdf36410 /qapi | |
| parent | ef302748655d02685d24126e0f9f11ea85c6123a (diff) | |
| parent | 3d63da16fbcd05405efd5946000cdb45474a9bad (diff) | |
| download | qemu-4cb890b858bd1bd5935457401630d95754c4be48.zip qemu-4cb890b858bd1bd5935457401630d95754c4be48.tar.gz qemu-4cb890b858bd1bd5935457401630d95754c4be48.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181031a' into staging
Minor migration fixes 2018-10-31
# gpg: Signature made Wed 31 Oct 2018 16:55:40 GMT
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20181031a:
migration: avoid segmentfault when take a snapshot of a VM which being migrated
qapi: Fix COLOStatus and query-colo-status since version
COLO: Fix Colo doc secondeary should be secondary
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/migration.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/migration.json b/qapi/migration.json index 0928f4b..38d4c41 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1317,7 +1317,7 @@ # # @reason: describes the reason for the COLO exit. # -# Since: 3.0 +# Since: 3.1 ## { 'struct': 'COLOStatus', 'data': { 'mode': 'COLOMode', 'reason': 'COLOExitReason' } } @@ -1334,7 +1334,7 @@ # -> { "execute": "query-colo-status" } # <- { "return": { "mode": "primary", "active": true, "reason": "request" } } # -# Since: 3.0 +# Since: 3.1 ## { 'command': 'query-colo-status', 'returns': 'COLOStatus' } |