render / rpms / qemu

Forked from rpms/qemu 9 months ago
Clone

Blame 0419-spice-use-error_report-to-report-errors.patch

Hans de Goede 56753f
From 2b973a5ea22635211cbde2e559cc6e6355ca8205 Mon Sep 17 00:00:00 2001
Hans de Goede 56753f
From: Christophe Fergeau <cfergeau@redhat.com>
Hans de Goede 56753f
Date: Fri, 24 Feb 2012 18:13:12 +0100
Hans de Goede 56753f
Subject: [PATCH 419/434] spice: use error_report to report errors
Hans de Goede 56753f
Hans de Goede 56753f
Error message reporting during spice startup wasn't consistent, it was done
Hans de Goede 56753f
with fprintf(stderr, "") but sometimes the message didn't have a trailing
Hans de Goede 56753f
\n. Using error_report make the intent of the message clearer and deal
Hans de Goede 56753f
with the final \n for us.
Hans de Goede 56753f
Hans de Goede 56753f
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Hans de Goede 56753f
---
Hans de Goede 56753f
 ui/spice-core.c |   22 +++++++++++-----------
Hans de Goede 56753f
 1 file changed, 11 insertions(+), 11 deletions(-)
Hans de Goede 56753f
Hans de Goede 56753f
diff --git a/ui/spice-core.c b/ui/spice-core.c
Hans de Goede 56753f
index 2c815f1..8503f03 100644
Hans de Goede 56753f
--- a/ui/spice-core.c
Hans de Goede 56753f
+++ b/ui/spice-core.c
Hans de Goede 56753f
@@ -227,8 +227,8 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
Hans de Goede 56753f
         add_addr_info(server, (struct sockaddr *)&info->laddr_ext,
Hans de Goede 56753f
                       info->llen_ext);
Hans de Goede 56753f
     } else {
Hans de Goede 56753f
-        fprintf(stderr, "spice: %s, extended address is expected\n",
Hans de Goede 56753f
-                        __func__);
Hans de Goede 56753f
+        error_report("spice: %s, extended address is expected",
Hans de Goede 56753f
+                     __func__);
Hans de Goede 56753f
 #endif
Hans de Goede 56753f
         add_addr_info(client, &info->paddr, info->plen);
Hans de Goede 56753f
         add_addr_info(server, &info->laddr, info->llen);
Hans de Goede 56753f
@@ -333,7 +333,7 @@ static int parse_name(const char *string, const char *optname,
Hans de Goede 56753f
     if (value != -1) {
Hans de Goede 56753f
         return value;
Hans de Goede 56753f
     }
Hans de Goede 56753f
-    fprintf(stderr, "spice: invalid %s: %s\n", optname, string);
Hans de Goede 56753f
+    error_report("spice: invalid %s: %s", optname, string);
Hans de Goede 56753f
     exit(1);
Hans de Goede 56753f
 }
Hans de Goede 56753f
 
Hans de Goede 56753f
@@ -525,7 +525,7 @@ static int add_channel(const char *name, const char *value, void *opaque)
Hans de Goede 56753f
         rc = spice_server_set_channel_security(spice_server, value, security);
Hans de Goede 56753f
     }
Hans de Goede 56753f
     if (rc != 0) {
Hans de Goede 56753f
-        fprintf(stderr, "spice: failed to set channel security for %s\n", value);
Hans de Goede 56753f
+        error_report("spice: failed to set channel security for %s", value);
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
     }
Hans de Goede 56753f
     return 0;
Hans de Goede 56753f
@@ -553,15 +553,15 @@ void qemu_spice_init(void)
Hans de Goede 56753f
     port = qemu_opt_get_number(opts, "port", 0);
Hans de Goede 56753f
     tls_port = qemu_opt_get_number(opts, "tls-port", 0);
Hans de Goede 56753f
     if (!port && !tls_port) {
Hans de Goede 56753f
-        fprintf(stderr, "neither port nor tls-port specified for spice.");
Hans de Goede 56753f
+        error_report("neither port nor tls-port specified for spice");
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
     }
Hans de Goede 56753f
     if (port < 0 || port > 65535) {
Hans de Goede 56753f
-        fprintf(stderr, "spice port is out of range");
Hans de Goede 56753f
+        error_report("spice port is out of range");
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
     }
Hans de Goede 56753f
     if (tls_port < 0 || tls_port > 65535) {
Hans de Goede 56753f
-        fprintf(stderr, "spice tls-port is out of range");
Hans de Goede 56753f
+        error_report("spice tls-port is out of range");
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
     }
Hans de Goede 56753f
     password = qemu_opt_get(opts, "password");
Hans de Goede 56753f
@@ -631,11 +631,11 @@ void qemu_spice_init(void)
Hans de Goede 56753f
 #if SPICE_SERVER_VERSION >= 0x000900 /* 0.9.0 */
Hans de Goede 56753f
         if (spice_server_set_sasl_appname(spice_server, "qemu") == -1 ||
Hans de Goede 56753f
             spice_server_set_sasl(spice_server, 1) == -1) {
Hans de Goede 56753f
-            fprintf(stderr, "spice: failed to enable sasl\n");
Hans de Goede 56753f
+            error_report("spice: failed to enable sasl");
Hans de Goede 56753f
             exit(1);
Hans de Goede 56753f
         }
Hans de Goede 56753f
 #else
Hans de Goede 56753f
-        fprintf(stderr, "spice: sasl is not available (spice >= 0.9 required)\n");
Hans de Goede 56753f
+        error_report("spice: sasl is not available (spice >= 0.9 required)");
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
 #endif
Hans de Goede 56753f
     }
Hans de Goede 56753f
@@ -683,7 +683,7 @@ void qemu_spice_init(void)
Hans de Goede 56753f
     qemu_opt_foreach(opts, add_channel, NULL, 0);
Hans de Goede 56753f
 
Hans de Goede 56753f
     if (0 != spice_server_init(spice_server, &core_interface)) {
Hans de Goede 56753f
-        fprintf(stderr, "failed to initialize spice server");
Hans de Goede 56753f
+        error_report("failed to initialize spice server");
Hans de Goede 56753f
         exit(1);
Hans de Goede 56753f
     };
Hans de Goede 56753f
     using_spice = 1;
Hans de Goede 56753f
@@ -708,7 +708,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
Hans de Goede 56753f
 {
Hans de Goede 56753f
     if (!spice_server) {
Hans de Goede 56753f
         if (QTAILQ_FIRST(&qemu_spice_opts.head) != NULL) {
Hans de Goede 56753f
-            fprintf(stderr, "Oops: spice configured but not active\n");
Hans de Goede 56753f
+            error_report("Oops: spice configured but not active");
Hans de Goede 56753f
             exit(1);
Hans de Goede 56753f
         }
Hans de Goede 56753f
         /*
Hans de Goede 56753f
-- 
Hans de Goede 56753f
1.7.10
Hans de Goede 56753f