[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/54] spice-char: improve error reporting
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 12/54] spice-char: improve error reporting |
Date: |
Tue, 13 Dec 2016 01:42:43 +0300 |
Set errp to report errors up.
Use error_report() to give hints about parameters on the right monitor,
instead of a direct fprintf() call.
Signed-off-by: Marc-André Lureau <address@hidden>
---
spice-qemu-char.c | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 5feb88c1ec..4e934cf224 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,13 @@ 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_report("allowed spice char type names: %s", subtypes);
+
+ g_free(subtypes);
return NULL;
}
@@ -326,7 +315,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;
}
--
2.11.0
- [Qemu-devel] [PATCH 01/54] gtk: avoid oob array access, (continued)
- [Qemu-devel] [PATCH 01/54] gtk: avoid oob array access, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 02/54] char: use a const CharDriver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 03/54] char: use a static array for backends, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 05/54] char: fold single-user functions in caller, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 04/54] char: move callbacks in CharDriver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 06/54] char: introduce generic qemu_chr_get_kind(), Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 07/54] char: use a feature bit for replay, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 09/54] bt: use qemu_chr_alloc(), Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 08/54] char: allocate CharDriverState as a single object, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 11/54] char: rename TCPChardev and NetChardev, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 12/54] spice-char: improve error reporting,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 13/54] char: use error_report(), Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 14/54] gtk: overwrite the console.c char driver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 10/54] char: rename CharDriverState Chardev, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 17/54] baum: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 16/54] spice-qemu-char: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 18/54] msmouse: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 19/54] mux: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 20/54] char-udp: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 15/54] chardev: qom-ify, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 21/54] char-socket: convert to finalize, Marc-André Lureau, 2016/12/12