summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2011-04-28 13:58:30 +0200
committerKevin Wolf <kwolf@redhat.com>2011-05-03 11:29:21 +0200
commit2ab3cb8c0ae79c96f38f6bfd35620cc18ddba19f (patch)
treec7c7e6e004c2658ae7c7a89be70953afb38b4e74
parentab71982716928577826b9aa7fc9a5102bfce5f0e (diff)
downloadfocaccia-qemu-2ab3cb8c0ae79c96f38f6bfd35620cc18ddba19f.tar.gz
focaccia-qemu-2ab3cb8c0ae79c96f38f6bfd35620cc18ddba19f.zip
qemu-progress.c: printf isn't signal safe
Change the signal handling to indicate a signal is pending, rather
then printing directly from the signal handler.

In addition make the signal prints go to stderr, rather than stdout.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--qemu-progress.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/qemu-progress.c b/qemu-progress.c
index e1feb89614..a4894c0dfc 100644
--- a/qemu-progress.c
+++ b/qemu-progress.c
@@ -37,6 +37,7 @@ struct progress_state {
 };
 
 static struct progress_state state;
+static volatile sig_atomic_t print_pending;
 
 /*
  * Simple progress print function.
@@ -63,12 +64,16 @@ static void progress_simple_init(void)
 #ifdef CONFIG_POSIX
 static void sigusr_print(int signal)
 {
-    printf("    (%3.2f/100%%)\n", state.current);
+    print_pending = 1;
 }
 #endif
 
 static void progress_dummy_print(void)
 {
+    if (print_pending) {
+        fprintf(stderr, "    (%3.2f/100%%)\n", state.current);
+        print_pending = 0;
+    }
 }
 
 static void progress_dummy_end(void)