[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointe
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointer to error_append_hint() |
Date: |
Tue, 17 Sep 2019 11:32:47 +0100 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
* Greg Kurz (address@hidden) wrote:
> Ensure that hints are added even if errp is &error_fatal or &error_abort.
>
> Signed-off-by: Greg Kurz <address@hidden>
A bit painful, but if it solves the problem,
Acked-by: Dr. David Alan Gilbert <address@hidden>
> ---
> migration/migration.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 01863a95f5fe..6724173ce34e 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -983,18 +983,24 @@ static bool migrate_caps_check(bool *cap_list,
>
> #ifndef CONFIG_LIVE_BLOCK_MIGRATION
> if (cap_list[MIGRATION_CAPABILITY_BLOCK]) {
> - error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) "
> + Error *local_err = NULL;
> +
> + error_setg(&local_err, "QEMU compiled without old-style (blk/-b,
> inc/-i) "
> "block migration");
> - error_append_hint(errp, "Use drive_mirror+NBD instead.\n");
> + error_append_hint(&local_err, "Use drive_mirror+NBD instead.\n");
> + error_propagate(errp, local_err);
> return false;
> }
> #endif
>
> #ifndef CONFIG_REPLICATION
> if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {
> - error_setg(errp, "QEMU compiled without replication module"
> + Error *local_err = NULL;
> +
> + error_setg(&local_err, "QEMU compiled without replication module"
> " can't enable COLO");
> - error_append_hint(errp, "Please enable replication before COLO.\n");
> + error_append_hint(&local_err, "Please enable replication before
> COLO.\n");
> + error_propagate(errp, local_err);
> return false;
> }
> #endif
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH 07/17] virtio-pci: Pass local error object pointer to error_append_hint(), (continued)
- [Qemu-devel] [PATCH 07/17] virtio-pci: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 09/17] hw/rdma: Fix missing conversion to rdma_error_report(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 10/17] s390x/css: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 11/17] scsi: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- Re: [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointer to error_append_hint(),
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH 13/17] nbd: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 14/17] ccid-card-emul: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 15/17] option: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 17/17] checkpatch: Warn when errp is passed to error_append_hint(), Greg Kurz, 2019/09/17