diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:45 +0100 |
| commit | e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc (patch) | |
| tree | d57853edbd09d7db0129f179d1436037d045a4b2 /migration/colo.c | |
| parent | b7092cda1b36ce687e65ab1831346f9529b781b8 (diff) | |
| parent | 805d44961b9015716cc13c1d3e49457af3970d82 (diff) | |
| download | focaccia-qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.tar.gz focaccia-qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-10-09' into staging
Error reporting patches for 2020-10-09 # gpg: Signature made Fri 09 Oct 2020 07:45:17 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-error-2020-10-09: error: Use error_fatal to simplify obvious fatal errors (again) error: Remove NULL checks on error_propagate() calls (again) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/colo.c')
| -rw-r--r-- | migration/colo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/migration/colo.c b/migration/colo.c index 80788d46b5..3f1d3dfd95 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -798,9 +798,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } static void colo_wait_handle_message(MigrationIncomingState *mis, |