| Message ID | 20230207075115.1525-12-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | error: Reduce qerror.h usage a bit more | expand |
Markus Armbruster <armbru@redhat.com> wrote: > The QERR_ macros are leftovers from the days of "rich" error objects. > We've been trying to reduce their remaining use. > > Get rid of a use of QERR_FEATURE_DISABLED, and improve the somewhat > imprecise error message > > (qemu) x_colo_lost_heartbeat > Error: The feature 'colo' is not enabled > > to > > Error: VM is not in COLO mode > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Althought in this case which error message is better is not so clear. Colo mode is compiled in, but it is not being "enabled". Later, Juan.
Juan Quintela <quintela@redhat.com> writes: > Markus Armbruster <armbru@redhat.com> wrote: >> The QERR_ macros are leftovers from the days of "rich" error objects. >> We've been trying to reduce their remaining use. >> >> Get rid of a use of QERR_FEATURE_DISABLED, and improve the somewhat >> imprecise error message >> >> (qemu) x_colo_lost_heartbeat >> Error: The feature 'colo' is not enabled >> >> to >> >> Error: VM is not in COLO mode >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: Juan Quintela <quintela@redhat.com> > > Althought in this case which error message is better is not so clear. > Colo mode is compiled in, but it is not being "enabled". In my new error message, I tried to convey that it is about the state of the VM, not the state of the QEMU binary.
diff --git a/migration/colo-failover.c b/migration/colo-failover.c index 42453481c4..6cb6f90357 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -17,7 +17,6 @@ #include "migration.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" -#include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "trace.h" @@ -78,7 +77,7 @@ FailoverStatus failover_get_state(void) void qmp_x_colo_lost_heartbeat(Error **errp) { if (get_colo_mode() == COLO_MODE_NONE) { - error_setg(errp, QERR_FEATURE_DISABLED, "colo"); + error_setg(errp, "VM is not in COLO mode"); return; }
The QERR_ macros are leftovers from the days of "rich" error objects. We've been trying to reduce their remaining use. Get rid of a use of QERR_FEATURE_DISABLED, and improve the somewhat imprecise error message (qemu) x_colo_lost_heartbeat Error: The feature 'colo' is not enabled to Error: VM is not in COLO mode Signed-off-by: Markus Armbruster <armbru@redhat.com> --- migration/colo-failover.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)