From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4GPC-0002FX-4b for qemu-devel@nongnu.org; Tue, 30 Jul 2013 16:20:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4GP6-0007om-Bm for qemu-devel@nongnu.org; Tue, 30 Jul 2013 16:20:26 -0400 Received: from mail-oa0-x229.google.com ([2607:f8b0:4003:c02::229]:43800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4GP6-0007oZ-7B for qemu-devel@nongnu.org; Tue, 30 Jul 2013 16:20:20 -0400 Received: by mail-oa0-f41.google.com with SMTP id j6so7760070oag.14 for ; Tue, 30 Jul 2013 13:20:19 -0700 (PDT) Sender: fluxion Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <20130723224602.26273.30116.stgit@outback> References: <20130723224525.26273.28321.stgit@outback> <20130723224602.26273.30116.stgit@outback> Message-ID: <20130730202015.14585.19131@loki> Date: Tue, 30 Jul 2013 15:20:15 -0500 Subject: Re: [Qemu-devel] [PATCH v8 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: Tomoki Sekiyama , qemu-devel@nongnu.org Cc: libaiqing@huawei.com, ghammer@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com, vrozenfe@redhat.com, pbonzini@redhat.com, seiji.aguchi@hds.com, lersek@redhat.com, areis@redhat.com Quoting Tomoki Sekiyama (2013-07-23 17:46:03) > 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 Reviewed-by: Michael Roth > --- > 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 =3D (state_dir =3D=3D dfl_pathnames.stat= e_dir) ? > NULL : > state_dir; > - return ga_install_service(path, log_filepath, fixed_stat= e_dir); > + if (ga_install_vss_provider()) { > + return EXIT_FAILURE; > + } > + if (ga_install_service(path, log_filepath, fixed_state_d= ir)) { > + return EXIT_FAILURE; > + } > + return 0; > } else if (strcmp(service, "uninstall") =3D=3D 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 ef5f0df..7b77a8c 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 =3D 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