[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/41] spice-char: improve error reporting
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/41] spice-char: improve error reporting |
Date: |
Fri, 27 Jan 2017 14:45:43 +0100 |
From: Marc-André Lureau <address@hidden>
Set errp to report errors up to the right monitor.
Use error_append_hint() to give hints about parameters on !qmp monitors,
instead of a direct fprintf() call.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
spice-qemu-char.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 38b1f6c..5e5897b 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -2,6 +2,7 @@
#include "trace.h"
#include "ui/qemu-spice.h"
#include "sysemu/char.h"
+#include "qemu/error-report.h"
#include <spice.h>
#include <spice/protocol.h>
@@ -239,23 +240,6 @@ static void spice_port_set_fe_open(struct Chardev *chr,
int fe_open)
#endif
}
-static void print_allowed_subtypes(void)
-{
- const char** psubtype;
- int i;
-
- fprintf(stderr, "allowed names: ");
- for(i=0, psubtype = spice_server_char_device_recognized_subtypes();
- *psubtype != NULL; ++psubtype, ++i) {
- if (i == 0) {
- fprintf(stderr, "%s", *psubtype);
- } else {
- fprintf(stderr, ", %s", *psubtype);
- }
- }
- fprintf(stderr, "\n");
-}
-
static void spice_chr_accept_input(struct Chardev *chr)
{
SpiceChardev *s = (SpiceChardev *)chr;
@@ -302,8 +286,14 @@ static Chardev *qemu_chr_open_spice_vmc(const CharDriver
*driver,
}
}
if (*psubtype == NULL) {
- fprintf(stderr, "spice-qemu-char: unsupported type: %s\n", type);
- print_allowed_subtypes();
+ char *subtypes = g_strjoinv(", ",
+ (gchar **)spice_server_char_device_recognized_subtypes());
+
+ error_setg(errp, "unsupported type name: %s", type);
+ error_append_hint(errp, "allowed spice char type names: %s\n",
+ subtypes);
+
+ g_free(subtypes);
return NULL;
}
@@ -326,7 +316,7 @@ static Chardev *qemu_chr_open_spice_port(const CharDriver
*driver,
SpiceChardev *s;
if (name == NULL) {
- fprintf(stderr, "spice-qemu-char: missing name parameter\n");
+ error_setg(errp, "missing name parameter");
return NULL;
}
--
1.8.3.1
- [Qemu-devel] [PULL 24/41] doc: fix spelling, (continued)
- [Qemu-devel] [PULL 24/41] doc: fix spelling, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 21/41] tests: fix linking test-char on win32, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 26/41] char: use a static array for backends, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 25/41] char: use a const CharDriver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 22/41] qemu-options: stdio is available on win32, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 28/41] char: fold single-user functions in caller, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 30/41] char: use a feature bit for replay, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 29/41] char: introduce generic qemu_chr_get_kind(), Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 32/41] bt: use qemu_chr_alloc(), Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 27/41] char: move callbacks in CharDriver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 35/41] spice-char: improve error reporting,
Paolo Bonzini <=
- [Qemu-devel] [PULL 37/41] gtk: overwrite the console.c char driver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 34/41] char: rename TCPChardev and NetChardev, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 38/41] baum: use a common prefix for chr callbacks, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 36/41] char: use error_report(), Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 31/41] char: allocate CharDriverState as a single object, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 39/41] vc: use a common prefix for chr callbacks, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 41/41] memory: don't sign-extend 32-bit writes, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 33/41] char: rename CharDriverState Chardev, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 40/41] chardev: qom-ify, Paolo Bonzini, 2017/01/27
- Re: [Qemu-devel] [PULL 00/41] Misc changes for 2017-01-27, Peter Maydell, 2017/01/27