Move line-buffering setup to OS specific files.

Move line-buffering setup to OS specific files.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Acked-by: Richard Henderson <rth@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/os-posix.c b/os-posix.c
index 3a96c91ca8d3494218e45da439cb0099f1b490d3..9bae8fe09e0e3aee3696520798990c9aa28f8a56 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -298,3 +298,8 @@ void os_pidfile_error(void)
     } else
         fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno));
 }
+
+void os_set_line_buffering(void)
+{
+    setvbuf(stdout, NULL, _IOLBF, 0);
+}

diff --git a/qemu-os-posix.h b/qemu-os-posix.h
index 8be583da681eb2479da2bbc07e3df3108226b5ad..cb210ba008ae01b6385aef288842d92423f3527d 100644 (file)
--- a/qemu-os-posix.h
+++ b/qemu-os-posix.h
@@ -30,6 +30,7 @@ static inline void os_host_main_loop_wait(int *timeout)
 {
 }
 
+void os_set_line_buffering(void);
 void os_setup_signal_handling(void);
 void os_daemonize(void);
 void os_setup_post(void);

diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index 39df333cf4094772a710bd0ecf291f55cd07ed19..5a97d8d10ae83349e97b1f8bfb789f98be9fc463 100644 (file)
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -45,5 +45,7 @@ void os_host_main_loop_wait(int *timeout);
 static inline void os_setup_signal_handling(void) {}
 static inline void os_daemonize(void) {}
 static inline void os_setup_post(void) {}
+/* Win32 doesn't support line-buffering and requires size >= 2 */
+static inline void os_set_line_buffering(void) {}
 
 #endif

diff --git a/vl.c b/vl.c
index cadd988fd215eec8572589c56afbcc371e1423e6..ba23e063c6f8a17ee500fbfc8e5a341857c326a6 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3215,10 +3215,7 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
-#ifndef _WIN32
-    /* Win32 doesn't support line-buffering and requires size >= 2 */
-    setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
+    os_set_line_buffering();
 
     if (init_timer_alarm() < 0) {
         fprintf(stderr, "could not initialize alarm timer\n");