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() isn't called and the problem is avoided. 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. Cc: Andrzej Zaborowski <balrog@zabor.org> Cc: Stefan Hajnoczi <stefanha@gmail.com> Cc: Anthony Liguori <aliguori@us.ibm.com> Cc: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
95 lines
2.8 KiB
C
95 lines
2.8 KiB
C
/*
|
|
* win32 specific declarations
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
* Copyright (c) 2010 Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef QEMU_OS_WIN32_H
|
|
#define QEMU_OS_WIN32_H
|
|
|
|
#include <windows.h>
|
|
#include <winsock2.h>
|
|
#include "main-loop.h"
|
|
|
|
/* Workaround for older versions of MinGW. */
|
|
#ifndef ECONNREFUSED
|
|
# define ECONNREFUSED WSAECONNREFUSED
|
|
#endif
|
|
#ifndef EINPROGRESS
|
|
# define EINPROGRESS WSAEINPROGRESS
|
|
#endif
|
|
#ifndef EHOSTUNREACH
|
|
# define EHOSTUNREACH WSAEHOSTUNREACH
|
|
#endif
|
|
#ifndef EINTR
|
|
# define EINTR WSAEINTR
|
|
#endif
|
|
#ifndef EINPROGRESS
|
|
# define EINPROGRESS WSAEINPROGRESS
|
|
#endif
|
|
#ifndef ENETUNREACH
|
|
# define ENETUNREACH WSAENETUNREACH
|
|
#endif
|
|
#ifndef ENOTCONN
|
|
# define ENOTCONN WSAENOTCONN
|
|
#endif
|
|
#ifndef EWOULDBLOCK
|
|
# define EWOULDBLOCK WSAEWOULDBLOCK
|
|
#endif
|
|
|
|
#if defined(_WIN64)
|
|
/* On w64, setjmp is implemented by _setjmp which needs a second parameter.
|
|
* If this parameter is NULL, longjump does no stack unwinding.
|
|
* That is what we need for QEMU. Passing the value of register rsp (default)
|
|
* lets longjmp try a stack unwinding which will crash with generated code. */
|
|
# undef setjmp
|
|
# define setjmp(env) _setjmp(env, NULL)
|
|
#endif
|
|
|
|
/* Declaration of ffs() is missing in MinGW's strings.h. */
|
|
int ffs(int i);
|
|
|
|
static inline void os_setup_signal_handling(void) {}
|
|
static inline void os_daemonize(void) {}
|
|
static inline void os_setup_post(void) {}
|
|
void os_set_line_buffering(void);
|
|
static inline void os_set_proc_name(const char *dummy) {}
|
|
|
|
#if !defined(EPROTONOSUPPORT)
|
|
# define EPROTONOSUPPORT EINVAL
|
|
#endif
|
|
|
|
int setenv(const char *name, const char *value, int overwrite);
|
|
|
|
typedef struct {
|
|
long tv_sec;
|
|
long tv_usec;
|
|
} qemu_timeval;
|
|
int qemu_gettimeofday(qemu_timeval *tp);
|
|
|
|
static inline bool is_daemonized(void)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#endif
|