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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/COLO-FT.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index 6302469..e2686bb 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -173,7 +173,7 @@ Secondary: { 'execute': 'nbd-server-start', 'arguments': {'addr': {'type': 'inet', 'data': {'host': 'xx.xx.xx.xx', 'port': '8889'} } } } -{'execute': 'nbd-server-add', 'arguments': {'device': 'secondeary-disk0', 'writable': true } } +{'execute': 'nbd-server-add', 'arguments': {'device': 'secondary-disk0', 'writable': true } } Note: a. The qmp command nbd-server-start and nbd-server-add must be run |