diff options
| author | Tomoki Sekiyama <tomoki.sekiyama@hds.com> | 2013-08-07 11:40:32 -0400 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-09-09 14:17:57 -0500 |
| commit | f311f2c20a1e33c1e5fdb50ee21e69a5bf26c950 (patch) | |
| tree | dd38ced465cd3262444d79c6e101d4936922aa86 | |
| parent | 64c003174039d0c63ea2bef48d600363ce80a58b (diff) | |
qemu-ga: Install Windows VSS provider on `qemu-ga -s install'
Register QGA VSS provider library into Windows when qemu-ga is installed as
Windows service ('-s install' option). It is deregistered when the service
is uninstalled ('-s uninstall' option).
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qga/main.c | 10 | ||||
| -rw-r--r-- | qga/vss-win32.c | 25 | ||||
| -rw-r--r-- | qga/vss-win32.h | 3 |
3 files changed, 37 insertions, 1 deletions
diff --git a/qga/main.c b/qga/main.c index 0e04e7395c..6c746c8f3a 100644 --- a/qga/main.c +++ b/qga/main.c @@ -34,6 +34,7 @@ #include "qemu/bswap.h" #ifdef _WIN32 #include "qga/service-win32.h" +#include "qga/vss-win32.h" #include <windows.h> #endif #ifdef __linux__ @@ -1031,8 +1032,15 @@ int main(int argc, char **argv) fixed_state_dir = (state_dir == dfl_pathnames.state_dir) ? NULL : state_dir; - return ga_install_service(path, log_filepath, fixed_state_dir); + if (ga_install_vss_provider()) { + return EXIT_FAILURE; + } + if (ga_install_service(path, log_filepath, fixed_state_dir)) { + return EXIT_FAILURE; + } + return 0; } else if (strcmp(service, "uninstall") == 0) { + ga_uninstall_vss_provider(); return ga_uninstall_service(); } else { printf("Unknown service command.\n"); diff --git a/qga/vss-win32.c b/qga/vss-win32.c index 89c0f3bd18..24c428842b 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -119,6 +119,31 @@ bool vss_initialized(void) return !!provider_lib; } +int ga_install_vss_provider(void) +{ + HRESULT hr; + + if (!vss_init(false)) { + fprintf(stderr, "Installation of VSS provider is skipped. " + "fsfreeze will be disabled.\n"); + return 0; + } + hr = call_vss_provider_func("COMRegister"); + vss_deinit(false); + + return SUCCEEDED(hr) ? 0 : EXIT_FAILURE; +} + +void ga_uninstall_vss_provider(void) +{ + if (!vss_init(false)) { + fprintf(stderr, "Removal of VSS provider is skipped.\n"); + return; + } + call_vss_provider_func("COMUnregister"); + vss_deinit(false); +} + /* Call VSS requester and freeze/thaw filesystems and applications */ void qga_vss_fsfreeze(int *nr_volume, Error **err, bool freeze) { diff --git a/qga/vss-win32.h b/qga/vss-win32.h index eac669c168..db8fbe5208 100644 --- a/qga/vss-win32.h +++ b/qga/vss-win32.h @@ -19,6 +19,9 @@ bool vss_init(bool init_requester); void vss_deinit(bool deinit_requester); bool vss_initialized(void); +int ga_install_vss_provider(void); +void ga_uninstall_vss_provider(void); + void qga_vss_fsfreeze(int *nr_volume, Error **err, bool freeze); #endif |