| Message ID | 156871570663.196432.7147178510220437381.stgit@bahia.lan |
|---|---|
| State | New |
| Headers | show |
| Series | Fix usage of error_append_hint() | expand |
* Greg Kurz (groug@kaod.org) wrote: > Ensure that hints are added even if errp is &error_fatal or &error_abort. > > Signed-off-by: Greg Kurz <groug@kaod.org> A bit painful, but if it solves the problem, Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > 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 / dgilbert@redhat.com / Manchester, UK
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
Ensure that hints are added even if errp is &error_fatal or &error_abort. Signed-off-by: Greg Kurz <groug@kaod.org> --- migration/migration.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)