[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() error
From: |
Zhanghailiang |
Subject: |
RE: [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() error handling |
Date: |
Mon, 20 Apr 2020 08:48:23 +0000 |
Reviewed-by: zhanghailiang <address@hidden>
> -----Original Message-----
> From: Markus Armbruster [mailto:address@hidden]
> Sent: Monday, April 20, 2020 4:33 PM
> To: address@hidden
> Cc: Zhang Chen <address@hidden>; Zhanghailiang
> <address@hidden>
> Subject: [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint()
> error handling
>
> The Error ** argument must be NULL, &error_abort, &error_fatal, or a
> pointer to a variable containing NULL. Passing an argument of the
> latter kind twice without clearing it in between is wrong: if the
> first call sets an error, it no longer points to NULL for the second
> call.
>
> qmp_xen_colo_do_checkpoint() passes @errp first to
> replication_do_checkpoint_all(), and then to
> colo_notify_filters_event(). If both fail, this will trip the
> assertion in error_setv().
>
> Similar code in secondary_vm_do_failover() calls
> colo_notify_filters_event() only after replication_do_checkpoint_all()
> succeeded. Do the same here.
>
> Fixes: 0e8818f023616677416840d6ddc880db8de3c967
> Cc: Zhang Chen <address@hidden>
> Cc: zhanghailiang <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> migration/colo.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/migration/colo.c b/migration/colo.c
> index a54ac84f41..1b3493729b 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -263,7 +263,13 @@ ReplicationStatus
> *qmp_query_xen_replication_status(Error **errp)
>
> void qmp_xen_colo_do_checkpoint(Error **errp)
> {
> - replication_do_checkpoint_all(errp);
> + Error *err = NULL;
> +
> + replication_do_checkpoint_all(&err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> /* Notify all filters of all NIC to do checkpoint */
> colo_notify_filters_event(COLO_EVENT_CHECKPOINT, errp);
> }
> --
> 2.21.1
- [PATCH 00/11] Miscellaneous error handling fixes, Markus Armbruster, 2020/04/20
- [PATCH 03/11] cpus: Fix configure_icount() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 06/11] fdc: Fix fallback=auto error handling, Markus Armbruster, 2020/04/20
- [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() error handling, Markus Armbruster, 2020/04/20
- [PATCH 05/11] arm/virt: Fix virt_machine_device_plug_cb() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 10/11] io: Fix qio_channel_socket_close() error handling, Markus Armbruster, 2020/04/20
- [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling, Markus Armbruster, 2020/04/20
- [PATCH 04/11] cpus: Proper range-checking for -icount shift=N, Markus Armbruster, 2020/04/20