From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux1Xk-00059r-Dr for qemu-devel@nongnu.org; Wed, 10 Jul 2013 17:03:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ux1Xh-0003n2-FU for qemu-devel@nongnu.org; Wed, 10 Jul 2013 17:03:20 -0400 Received: from usindpps06.hds.com ([207.126.252.19]:36027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux1Xg-0003mr-Vq for qemu-devel@nongnu.org; Wed, 10 Jul 2013 17:03:17 -0400 From: Tomoki Sekiyama Date: Wed, 10 Jul 2013 17:03:02 -0400 Message-ID: <20130710210302.31600.3008.stgit@hds.com> In-Reply-To: <20130710210223.31600.53856.stgit@hds.com> References: <20130710210223.31600.53856.stgit@hds.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v6 09/10] qemu-ga: Install Windows VSS provider on `qemu-ga -s install' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: libaiqing@huawei.com, ghammer@redhat.com, stefanha@gmail.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, vrozenfe@redhat.com, pbonzini@redhat.com, seiji.aguchi@hds.com, lersek@redhat.com, areis@redhat.com 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 --- qga/main.c | 10 +++++++++- qga/vss-win32.c | 25 +++++++++++++++++++++++++ qga/vss-win32.h | 3 +++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/qga/main.c b/qga/main.c index 0e04e73..6c746c8 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 #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 27d5b14..d65b520 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -107,6 +107,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 eac669c..db8fbe5 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