Patchwork [1/2] Add \n to the end of fatal spice error messages

login
register
mail settings
Submitter Christophe Fergeau
Date Feb. 24, 2012, 10:37 a.m.
Message ID <1330079874-5818-1-git-send-email-cfergeau@redhat.com>
Download mbox | patch
Permalink /patch/142927/
State New
Headers show

Comments

Christophe Fergeau - Feb. 24, 2012, 10:37 a.m.
Without it the shell prompt doesn't appear on a new line after
qemu dies.
---
 ui/spice-core.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Gerd Hoffmann - Feb. 24, 2012, 4:47 p.m.
On 02/24/12 11:37, Christophe Fergeau wrote:
> Without it the shell prompt doesn't appear on a new line after
> qemu dies.
> ---
>  ui/spice-core.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index 1308a3d..6d240a3 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -568,15 +568,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.");
> +        fprintf(stderr, "neither port nor tls-port specified for spice.\n");

Even better is this (no newline needed here):
  error_report("neither port nor tls-port specified fo  spice.");

>          exit(1);
>      }
>      if (port < 0 || port > 65535) {
> -        fprintf(stderr, "spice port is out of range");
> +        fprintf(stderr, "spice port is out of range\n");
>          exit(1);
>      }
>      if (tls_port < 0 || tls_port > 65535) {
> -        fprintf(stderr, "spice tls-port is out of range");
> +        fprintf(stderr, "spice tls-port is out of range\n");
>          exit(1);
>      }
>      password = qemu_opt_get(opts, "password");
> @@ -700,7 +700,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");
> +        fprintf(stderr, "failed to initialize spice server\n");
>          exit(1);
>      };
>      using_spice = 1;

Patch

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 1308a3d..6d240a3 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -568,15 +568,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.");
+        fprintf(stderr, "neither port nor tls-port specified for spice.\n");
         exit(1);
     }
     if (port < 0 || port > 65535) {
-        fprintf(stderr, "spice port is out of range");
+        fprintf(stderr, "spice port is out of range\n");
         exit(1);
     }
     if (tls_port < 0 || tls_port > 65535) {
-        fprintf(stderr, "spice tls-port is out of range");
+        fprintf(stderr, "spice tls-port is out of range\n");
         exit(1);
     }
     password = qemu_opt_get(opts, "password");
@@ -700,7 +700,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");
+        fprintf(stderr, "failed to initialize spice server\n");
         exit(1);
     };
     using_spice = 1;