[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] qga: save state directory in ga_install_service
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 6/7] qga: save state directory in ga_install_service() |
Date: |
Thu, 30 May 2013 13:59:00 -0500 |
From: Laszlo Ersek <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
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
- [Qemu-devel] [PULL 0/7] qemu-ga: local state directory fixes for win32, Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 3/7] configure: don't save any fixed local_statedir for win32, Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 2/7] qga: determine default state dir and pidfile dynamically, Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 1/7] osdep: add qemu_get_local_state_pathname(), Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 6/7] qga: save state directory in ga_install_service(),
Michael Roth <=
- [Qemu-devel] [PATCH 5/7] qga: remove undefined behavior in ga_install_service(), Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 7/7] Makefile: create ".../var/run" when installing the POSIX guest agent, Michael Roth, 2013/05/30
- [Qemu-devel] [PATCH 4/7] qga: create state directory on win32, Michael Roth, 2013/05/30