diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-30 09:33:36 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-30 09:33:40 +0100 |
| commit | d0eda02938054268751c6c7bf00219f695b0ca8b (patch) | |
| tree | 9fd7119c0c284362d2a261b8e177d13d69e7fa3e /migration/colo.c | |
| parent | 62e570b1c50cac88fb0e940cfcb7820732106c20 (diff) | |
| parent | 8c1bc1e9d770e7576fc272424dd48eb008ebff39 (diff) | |
Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-23' into staging
QAPI patches for 2017-05-23
# gpg: Signature made Tue 23 May 2017 12:33:32 PM BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* armbru/tags/pull-qapi-2017-05-23:
qapi-schema: Remove obsolete note from ObjectTypeInfo
block: Use QDict helpers for --force-share
shutdown: Expose bool cause in SHUTDOWN and RESET events
shutdown: Add source information to SHUTDOWN and RESET
shutdown: Preserve shutdown cause through replay
shutdown: Prepare for use of an enum in reset/shutdown_request
shutdown: Simplify shutdown_signal
sockets: Plug memory leak in socket_address_flatten()
scripts/qmp/qom-set: fix the value argument passed to srv.command()
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'migration/colo.c')
| -rw-r--r-- | migration/colo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/colo.c b/migration/colo.c index 929b31c50c..8c13a3c3f1 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -626,7 +626,7 @@ void *colo_process_incoming_thread(void *opaque) } qemu_mutex_lock_iothread(); - qemu_system_reset(VMRESET_SILENT); + qemu_system_reset(SHUTDOWN_CAUSE_NONE); vmstate_loading = true; if (qemu_loadvm_state(fb) < 0) { error_report("COLO: loadvm failed"); |