From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Juan Quintela" <quintela@redhat.com>
Subject: [PULL 11/12] migration/colo: Improve an x-colo-lost-heartbeat error message
Date: Thu, 23 Feb 2023 14:46:25 +0100 [thread overview]
Message-ID: <20230223134626.2107382-12-armbru@redhat.com> (raw)
In-Reply-To: <20230223134626.2107382-1-armbru@redhat.com>
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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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;
}
--
2.39.0
next prev parent reply other threads:[~2023-02-23 13:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 13:46 [PULL 00/12] Error reporting patches patches for 2023-02-23 Markus Armbruster
2023-02-23 13:46 ` [PULL 01/12] error: Drop superfluous #include "qapi/qmp/qerror.h" Markus Armbruster
2023-02-23 13:46 ` [PULL 02/12] dump: Improve error message when target doesn't support memory dump Markus Armbruster
2023-02-23 13:46 ` [PULL 03/12] dump: Assert cpu_get_note_size() can't fail Markus Armbruster
2023-02-23 13:46 ` [PULL 04/12] hw/core: Improve error message when machine doesn't provide NMIs Markus Armbruster
2023-02-23 13:46 ` [PULL 05/12] hw/smbios: Dumb down smbios_entry_add() stub Markus Armbruster
2023-02-23 13:46 ` [PULL 06/12] hw/acpi: Dumb down acpi_table_add() stub Markus Armbruster
2023-02-23 13:46 ` [PULL 07/12] hw/acpi: Move QMP command to hw/core/ Markus Armbruster
2023-02-23 13:46 ` [PULL 08/12] qga: Drop dangling reference to QERR_QGA_LOGGING_DISABLED Markus Armbruster
2023-02-23 13:46 ` [PULL 09/12] replay: Simplify setting replay blockers Markus Armbruster
2023-02-23 13:46 ` [PULL 10/12] hw/core: Improve the query-hotpluggable-cpus error message Markus Armbruster
2023-02-23 13:46 ` Markus Armbruster [this message]
2023-02-23 13:46 ` [PULL 12/12] rocker: Tweak stubbed out monitor commands' error messages Markus Armbruster
2023-02-24 18:50 ` [PULL 00/12] Error reporting patches patches for 2023-02-23 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230223134626.2107382-12-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).