From 327adeecdde6f2b12ba32d0b886a720e40900b31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Mar 2022 19:57:37 +0400 Subject: [PATCH] include: move os_*() to os-foo.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For consistency with other os_ functions that do not have POSIX implementation, declare an inline function for the stub in os-win32.h. Signed-off-by: Marc-André Lureau Message-Id: <20220323155743.1585078-27-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu-common.h | 4 ---- include/sysemu/os-posix.h | 2 ++ include/sysemu/os-win32.h | 4 +++- os-win32.c | 9 --------- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 1fbc20e4bcf..a271cac66a1 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -24,10 +24,6 @@ int qemu_main(int argc, char **argv, char **envp); #endif -/* OS specific functions */ -void os_setup_early_signal_handling(void); -int os_parse_cmd_args(int index, const char *optarg); - void page_size_init(void); #endif diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h index 23bd45457d7..58de7c994d8 100644 --- a/include/sysemu/os-posix.h +++ b/include/sysemu/os-posix.h @@ -42,7 +42,9 @@ extern "C" { #endif +int os_parse_cmd_args(int index, const char *optarg); void os_set_line_buffering(void); +void os_setup_early_signal_handling(void); void os_set_proc_name(const char *s); void os_setup_signal_handling(void); void os_daemonize(void); diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 1351d1d29ec..3c74a78e33b 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -62,8 +62,10 @@ struct tm *localtime_r(const time_t *timep, struct tm *result); 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) {} +static inline int os_parse_cmd_args(int index, const char *optarg) { return -1; } +void os_set_line_buffering(void); +void os_setup_early_signal_handling(void); int getpagesize(void); diff --git a/os-win32.c b/os-win32.c index e31c921983b..6f21b578417 100644 --- a/os-win32.c +++ b/os-win32.c @@ -61,12 +61,3 @@ void os_set_line_buffering(void) setbuf(stdout, NULL); setbuf(stderr, NULL); } - -/* - * Parse OS specific command line options. - * return 0 if option handled, -1 otherwise - */ -int os_parse_cmd_args(int index, const char *optarg) -{ - return -1; -} -- 2.39.5