From patchwork Fri Jun 4 16:09:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 54643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2102AB7D4A for ; Sat, 5 Jun 2010 03:03:12 +1000 (EST) Received: from localhost ([127.0.0.1]:43659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKaIX-0005Da-CW for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 13:03:09 -0400 Received: from [140.186.70.92] (port=46508 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKZYa-0003HQ-0a for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKZSr-0006mG-Qw for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37116) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKZSr-0006mC-JQ for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:45 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9h5Y029979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jun 2010 12:09:43 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9Hq7024734; Fri, 4 Jun 2010 12:09:42 -0400 From: Jes.Sorensen@redhat.com To: anthony@codemonkey.ws Date: Fri, 4 Jun 2010 18:09:13 +0200 Message-Id: <1275667755-4821-16-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes Sorensen , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 15/17] Make os_change_process_uid and os_change_root os-posix.c local X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 1672e06..3a96c91 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 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 c4aa84a..39df333 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) {}