diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2010-06-10 11:42:29 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-06-12 08:49:15 +0300 |
| commit | e06eb601b098d9bcb32eb1ce5e00920d638c6d51 (patch) | |
| tree | 69f79fd6ab20a8023aa0decb04e775c5bda24820 | |
| parent | eb505be11b18b09c621dfb19a4e3b5f703c69eeb (diff) | |
Make os_change_process_uid and os_change_root os-posix.c local
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 <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>
| -rw-r--r-- | os-posix.c | 8 | ||||
| -rw-r--r-- | qemu-os-posix.h | 2 | ||||
| -rw-r--r-- | qemu-os-win32.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/os-posix.c b/os-posix.c index 1672e06550..3a96c91ca8 100644 --- a/os-posix.c +++ b/os-posix.c @@ -169,7 +169,7 @@ void os_parse_cmd_args(int index, const char *optarg) return; } -void os_change_process_uid(void) +static void change_process_uid(void) { if (user_pwd) { if (setgid(user_pwd->pw_gid) < 0) { @@ -187,7 +187,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) { @@ -276,8 +276,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 9b07660de7..8be583da68 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 c4aa84a5f2..39df333cf4 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) {} |