From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui85j-0006LX-9I for qemu-devel@nongnu.org; Thu, 30 May 2013 15:00:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ui85Z-0007f0-Vt for qemu-devel@nongnu.org; Thu, 30 May 2013 15:00:51 -0400 Received: from mail-qe0-f53.google.com ([209.85.128.53]:40376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui85Z-0007er-RU for qemu-devel@nongnu.org; Thu, 30 May 2013 15:00:41 -0400 Received: by mail-qe0-f53.google.com with SMTP id s14so376887qeb.12 for ; Thu, 30 May 2013 12:00:41 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Thu, 30 May 2013 13:59:00 -0500 Message-Id: <1369940341-9043-7-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1369940341-9043-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1369940341-9043-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 6/7] qga: save state directory in ga_install_service() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, lersek@redhat.com From: Laszlo Ersek If the user selects a non-default state directory at service installation time, we should remember it in the registered service. Signed-off-by: Laszlo Ersek Signed-off-by: Michael Roth --- qga/main.c | 11 ++++++++++- qga/service-win32.c | 6 +++++- qga/service-win32.h | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/qga/main.c b/qga/main.c index 5f2d141..0e04e73 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1022,7 +1022,16 @@ int main(int argc, char **argv) case 's': service = optarg; if (strcmp(service, "install") == 0) { - return ga_install_service(path, log_filepath); + const char *fixed_state_dir; + + /* If the user passed the "-t" option, we save that state dir + * in the service. Otherwise we let the service fetch the state + * dir from the environment when it starts. + */ + fixed_state_dir = (state_dir == dfl_pathnames.state_dir) ? + NULL : + state_dir; + return ga_install_service(path, log_filepath, fixed_state_dir); } else if (strcmp(service, "uninstall") == 0) { return ga_uninstall_service(); } else { diff --git a/qga/service-win32.c b/qga/service-win32.c index 8a5de8a..02926ab 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -35,7 +35,8 @@ static int printf_win_error(const char *text) return n; } -int ga_install_service(const char *path, const char *logfile) +int ga_install_service(const char *path, const char *logfile, + const char *state_dir) { SC_HANDLE manager; SC_HANDLE service; @@ -56,6 +57,9 @@ int ga_install_service(const char *path, const char *logfile) if (logfile) { g_string_append_printf(cmdline, " -l %s -v", logfile); } + if (state_dir) { + g_string_append_printf(cmdline, " -t %s", state_dir); + } g_debug("service's cmdline: %s", cmdline->str); diff --git a/qga/service-win32.h b/qga/service-win32.h index 99dfc53..3b9e870 100644 --- a/qga/service-win32.h +++ b/qga/service-win32.h @@ -24,7 +24,8 @@ typedef struct GAService { SERVICE_STATUS_HANDLE status_handle; } GAService; -int ga_install_service(const char *path, const char *logfile); +int ga_install_service(const char *path, const char *logfile, + const char *state_dir); int ga_uninstall_service(void); #endif -- 1.7.9.5