From 2b973a5ea22635211cbde2e559cc6e6355ca8205 Mon Sep 17 00:00:00 2001

From: Christophe Fergeau <cfergeau@redhat.com>

Date: Fri, 24 Feb 2012 18:13:12 +0100

Subject: [PATCH 419/434] spice: use error_report to report errors

Error message reporting during spice startup wasn't consistent, it was done

with fprintf(stderr, "") but sometimes the message didn't have a trailing

\n. Using error_report make the intent of the message clearer and deal

with the final \n for us.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 ui/spice-core.c |   22 +++++++++++-----------

 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c

index 2c815f1..8503f03 100644

--- a/ui/spice-core.c

+++ b/ui/spice-core.c

@@ -227,8 +227,8 @@ static void channel_event(int event, SpiceChannelEventInfo *info)

         add_addr_info(server, (struct sockaddr *)&info->laddr_ext,

                       info->llen_ext);

     } else {

-        fprintf(stderr, "spice: %s, extended address is expected\n",

-                        __func__);

+        error_report("spice: %s, extended address is expected",

+                     __func__);

 #endif

         add_addr_info(client, &info->paddr, info->plen);

         add_addr_info(server, &info->laddr, info->llen);

@@ -333,7 +333,7 @@ static int parse_name(const char *string, const char *optname,

     if (value != -1) {

         return value;

     }

-    fprintf(stderr, "spice: invalid %s: %s\n", optname, string);

+    error_report("spice: invalid %s: %s", optname, string);

     exit(1);

 }

@@ -525,7 +525,7 @@ static int add_channel(const char *name, const char *value, void *opaque)

         rc = spice_server_set_channel_security(spice_server, value, security);

     }

     if (rc != 0) {

-        fprintf(stderr, "spice: failed to set channel security for %s\n", value);

+        error_report("spice: failed to set channel security for %s", value);

         exit(1);

     }

     return 0;

@@ -553,15 +553,15 @@ void qemu_spice_init(void)

     port = qemu_opt_get_number(opts, "port", 0);

     tls_port = qemu_opt_get_number(opts, "tls-port", 0);

     if (!port && !tls_port) {

-        fprintf(stderr, "neither port nor tls-port specified for spice.");

+        error_report("neither port nor tls-port specified for spice");

         exit(1);

     }

     if (port < 0 || port > 65535) {

-        fprintf(stderr, "spice port is out of range");

+        error_report("spice port is out of range");

         exit(1);

     }

     if (tls_port < 0 || tls_port > 65535) {

-        fprintf(stderr, "spice tls-port is out of range");

+        error_report("spice tls-port is out of range");

         exit(1);

     }

     password = qemu_opt_get(opts, "password");

@@ -631,11 +631,11 @@ void qemu_spice_init(void)

 #if SPICE_SERVER_VERSION >= 0x000900 /* 0.9.0 */

         if (spice_server_set_sasl_appname(spice_server, "qemu") == -1 ||

             spice_server_set_sasl(spice_server, 1) == -1) {

-            fprintf(stderr, "spice: failed to enable sasl\n");

+            error_report("spice: failed to enable sasl");

             exit(1);

         }

 #else

-        fprintf(stderr, "spice: sasl is not available (spice >= 0.9 required)\n");

+        error_report("spice: sasl is not available (spice >= 0.9 required)");

         exit(1);

 #endif

     }

@@ -683,7 +683,7 @@ void qemu_spice_init(void)

     qemu_opt_foreach(opts, add_channel, NULL, 0);

     if (0 != spice_server_init(spice_server, &core_interface)) {

-        fprintf(stderr, "failed to initialize spice server");

+        error_report("failed to initialize spice server");

         exit(1);

     };

     using_spice = 1;

@@ -708,7 +708,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)

 {

     if (!spice_server) {

         if (QTAILQ_FIRST(&qemu_spice_opts.head) != NULL) {

-            fprintf(stderr, "Oops: spice configured but not active\n");

+            error_report("Oops: spice configured but not active");

             exit(1);

         }

         /*

-- 

1.7.10