]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
migration/colo: Improve an x-colo-lost-heartbeat error message
authorMarkus Armbruster <armbru@redhat.com>
Tue, 7 Feb 2023 07:51:14 +0000 (08:51 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 23 Feb 2023 13:10:17 +0000 (14:10 +0100)
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>
Message-Id: <20230207075115.1525-12-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
migration/colo-failover.c

index 42453481c41aec7d2b27a2ed699035cb007af253..6cb6f90357b29a0d429c485b162eb2fb4ae18136 100644 (file)
@@ -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;
     }