qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 06/13] ui: Improve a client_migrate_info error message
Date: Thu, 10 Dec 2020 17:31:25 +0100	[thread overview]
Message-ID: <20201210163132.2919935-7-armbru@redhat.com> (raw)
In-Reply-To: <20201210163132.2919935-1-armbru@redhat.com>

client_migrate_info reports spice_server_migrate_connect() failure as
"An undefined error has occurred".  Improve to "Could not set up
display for migration".

QERR_UNDEFINED_ERROR is now unused.  Drop.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-6-armbru@redhat.com>
---
 include/qapi/qmp/qerror.h | 3 ---
 monitor/misc.c            | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index d8267129bc..596fce0c54 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -65,9 +65,6 @@
 #define QERR_REPLAY_NOT_SUPPORTED \
     "Record/replay feature is not supported for '%s'"
 
-#define QERR_UNDEFINED_ERROR \
-    "An undefined error has occurred"
-
 #define QERR_UNSUPPORTED \
     "this feature or command is not currently supported"
 
diff --git a/monitor/misc.c b/monitor/misc.c
index c563e901c0..bb102df823 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -441,7 +441,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,
                                     has_port ? port : -1,
                                     has_tls_port ? tls_port : -1,
                                     cert_subject)) {
-            error_setg(errp, QERR_UNDEFINED_ERROR);
+            error_setg(errp, "Could not set up display for migration");
             return;
         }
         return;
-- 
2.26.2



  parent reply	other threads:[~2020-12-10 16:47 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-10 16:31 [PULL 00/13] Miscellaneous patches for 2020-12-10 Markus Armbruster
2020-12-10 16:31 ` [PULL 01/13] Clean up includes Markus Armbruster
2020-12-10 16:31 ` [PULL 02/13] qerror: Drop unused QERR_ macros Markus Armbruster
2020-12-10 16:31 ` [PULL 03/13] qerror: Eliminate QERR_ macros used in just one place Markus Armbruster
2020-12-10 16:31 ` [PULL 04/13] block: Improve some block-commit, block-stream error messages Markus Armbruster
2020-12-10 16:31 ` [PULL 05/13] ui: Improve some set_passwd, expire_password " Markus Armbruster
2020-12-10 16:31 ` Markus Armbruster [this message]
2020-12-10 16:31 ` [PULL 07/13] ui: Tweak a client_migrate_info error message Markus Armbruster
2020-12-10 16:31 ` [PULL 08/13] qga: Replace an unreachable error by abort() Markus Armbruster
2020-12-10 16:31 ` [PULL 09/13] qga: Tweak a guest-shutdown error message Markus Armbruster
2020-12-10 16:31 ` [PULL 10/13] qom: Improve {qom, device}-list-properties error messages Markus Armbruster
2020-12-10 16:31 ` [PULL 11/13] Tweak a few "Parameter 'NAME' expects THING" error message Markus Armbruster
2020-12-10 16:31 ` [PULL 12/13] qapi: Normalize version references x.y.0 to just x.y Markus Armbruster
2020-12-10 16:31 ` [PULL 13/13] docs/devel/writing-qmp-commands.txt: Fix docs Markus Armbruster
2020-12-11  2:11   ` Zihao Chang
2020-12-10 19:30 ` [PULL 00/13] Miscellaneous patches for 2020-12-10 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=20201210163132.2919935-7-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).