qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, tomoki.sekiyama@hds.com
Subject: [Qemu-devel] [PATCH 09/10] qemu-ga: Install Windows VSS provider on `qemu-ga -s install'
Date: Mon,  9 Sep 2013 14:41:40 -0500	[thread overview]
Message-ID: <1378755701-2051-10-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1378755701-2051-1-git-send-email-mdroth@linux.vnet.ibm.com>

From: Tomoki Sekiyama <tomoki.sekiyama@hds.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 <tomoki.sekiyama@hds.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 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 <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 89c0f3b..24c4288 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 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
-- 
1.7.9.5

  parent reply	other threads:[~2013-09-09 19:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-09 19:41 [Qemu-devel] [PULL] qemu-ga: VSS/fsfreeze support for Win32 Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 01/10] configure: Support configuring C++ compiler Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 02/10] Add c++ keywords to QAPI helper script Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 03/10] checkpatch.pl: Check .cpp files Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 04/10] Add a script to extract VSS SDK headers on POSIX system Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 05/10] qemu-ga: Add configure options to specify path to Windows/VSS SDK Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 06/10] error: Add error_set_win32 and error_setg_win32 Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 07/10] qemu-ga: Add Windows VSS provider and requester as DLL Michael Roth
2013-09-09 19:41 ` [Qemu-devel] [PATCH 08/10] qemu-ga: Call Windows VSS requester in fsfreeze command handler Michael Roth
2013-09-09 19:41 ` Michael Roth [this message]
2013-09-09 19:41 ` [Qemu-devel] [PATCH 10/10] QMP/qemu-ga-client: Make timeout longer for guest-fsfreeze-freeze command Michael Roth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378755701-2051-10-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=tomoki.sekiyama@hds.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).