From patchwork Thu Jun 3 16:48:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [14/16] Make os_change_process_uid and os_change_root os-posix.c local Date: Thu, 03 Jun 2010 06:48:10 -0000 From: Jes Sorensen X-Patchwork-Id: 54504 Message-Id: <1275583692-11678-15-git-send-email-Jes.Sorensen@redhat.com> To: anthony@codemonkey.ws Cc: Jes Sorensen , qemu-devel@nongnu.org From: Jes Sorensen os_change_process_uid() and os_change_root() are now only called from os-posix.c, so no need to keep win32 stubs for them. Signed-off-by: Jes Sorensen --- os-posix.c | 8 ++++---- qemu-os-posix.h | 2 -- qemu-os-win32.h | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/os-posix.c b/os-posix.c index 8a9d102..7ac6f07 100644 --- a/os-posix.c +++ b/os-posix.c @@ -184,7 +184,7 @@ int os_parse_cmd_args(const QEMUOption *popt, const char *optarg) return ret; } -void os_change_process_uid(void) +static void change_process_uid(void) { if (user_pwd) { if (setgid(user_pwd->pw_gid) < 0) { @@ -202,7 +202,7 @@ void os_change_process_uid(void) } } -void os_change_root(void) +static void change_root(void) { if (chroot_dir) { if (chroot(chroot_dir) < 0) { @@ -291,8 +291,8 @@ void os_setup_post(void) exit(1); } - os_change_root(); - os_change_process_uid(); + change_root(); + change_process_uid(); if (daemonize) { dup2(fd, 0); diff --git a/qemu-os-posix.h b/qemu-os-posix.h index 9b07660..8be583d 100644 --- a/qemu-os-posix.h +++ b/qemu-os-posix.h @@ -31,8 +31,6 @@ static inline void os_host_main_loop_wait(int *timeout) } void os_setup_signal_handling(void); -void os_change_process_uid(void); -void os_change_root(void); void os_daemonize(void); void os_setup_post(void); diff --git a/qemu-os-win32.h b/qemu-os-win32.h index ccb9691..facd3d6 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -43,8 +43,6 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); void os_host_main_loop_wait(int *timeout); static inline void os_setup_signal_handling(void) {}; -static inline void os_change_process_uid(void) {}; -static inline void os_change_root(void) {}; static inline void os_daemonize(void) {}; static inline void os_setup_post(void) {};