[Qemu-trivial] [PATCH] curses: don't initialize curses when qemu is daemonized

[Hitoshi Mitake]

Current qemu initializes curses even if -daemonize option is
passed. This cause problem because shell prompt appears without
calling endwin().

This patch adds new function, is_daemonized(), to OS dependent
code. With this function, curses_display_init() can check that qemu is
daemonized or not. If daemonized, curses_display_init() returns
immediately.

Of course, -daemonize && -curses doesn't make sense. Users shouldn't
pass the arguments at the same time. But the problem is very painful
because Ctrl-C cannot be delivered to the terminal. So if this
approach isn't acceptable, -daemonize && -curses combination should be
treated as error.


BTW, I didn't build and test on windows environment because I don't
have it which is capable of qemu build. Could someone build and test
it on windows?

Cc: Andrzej Zaborowski  <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Cc: Anthony Liguori <address@hidden>
Cc: Michael Roth <address@hidden>
Signed-off-by: Hitoshi Mitake <address@hidden>
---
 os-posix.c      |    5 +++++
 qemu-os-posix.h |    2 ++
 qemu-os-win32.h |    5 +++++
 ui/curses.c     |    4 ++++
 4 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/os-posix.c b/os-posix.c
index 79fa228..99c5343 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -360,3 +360,8 @@ int qemu_create_pidfile(const char *filename)
     /* keep pidfile open & locked forever */
     return 0;
 }
+
+int is_daemonized(void)
+{
+    return daemonize;
+}
diff --git a/qemu-os-posix.h b/qemu-os-posix.h
index 8e1149d..0b2b60a 100644
--- a/qemu-os-posix.h
+++ b/qemu-os-posix.h
@@ -46,4 +46,6 @@ typedef struct timeval qemu_timeval;
 typedef struct timespec qemu_timespec;
 int qemu_utimens(const char *path, const qemu_timespec *times);
 
+int is_daemonized(void);
+
 #endif
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index 753679b..08a6fa8 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -86,4 +86,9 @@ typedef struct {
 } qemu_timeval;
 int qemu_gettimeofday(qemu_timeval *tp);
 
+static inline int is_daemonized(void)
+{
+    return 0;
+}
+
 #endif
diff --git a/ui/curses.c b/ui/curses.c
index c2be2c6..fc6ae8c 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -335,6 +335,10 @@ static void curses_keyboard_setup(void)
 void curses_display_init(DisplayState *ds, int full_screen)
 {
     DisplayChangeListener *dcl;
+
+    if (is_daemonized())
+        return;
+
 #ifndef _WIN32
     if (!isatty(1)) {
         fprintf(stderr, "We need a terminal output\n");
-- 
1.7.5.1