From patchwork Mon Sep 9 19:41:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 273668 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B5EC2C0113 for ; Tue, 10 Sep 2013 05:47:20 +1000 (EST) Received: from localhost ([::1]:53465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ7Qc-0004ju-7h for incoming@patchwork.ozlabs.org; Mon, 09 Sep 2013 15:47:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ7MN-0000MP-2z for qemu-devel@nongnu.org; Mon, 09 Sep 2013 15:43:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJ7MH-0005xn-Sr for qemu-devel@nongnu.org; Mon, 09 Sep 2013 15:42:55 -0400 Received: from mail-ob0-x22e.google.com ([2607:f8b0:4003:c01::22e]:63506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJ7MH-0005xf-Nk for qemu-devel@nongnu.org; Mon, 09 Sep 2013 15:42:49 -0400 Received: by mail-ob0-f174.google.com with SMTP id wd6so6327628obb.33 for ; Mon, 09 Sep 2013 12:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=SONZRJZz6nzlnJxjvGSGHmnRZnek8Jnknp1g5MIG8so=; b=fwT464geUhwRVLFBGlDIQ/8oLhboNPSaFS6W9Aogt/AHddpdbtZiUTv/iUWg/dFCti UsaOP6QJBVhhDZ0RBKmH/7p1j47Hz9F7QfH8amgYTo6tGXw+T1+xT4hdfDYYzSl8HTKx 15N09jTdg6n2eZdPdbtyp8K+p6nx/hnErtAHcBamwi4cp/CSZuMBR2FrlwoEUdfK58KU AtXZPdOE/5ml0+PRy1Tgr011Tm0BKhOUNhin7+pYTWm1uHPba/F/3PUH3fxyrhzeUP+x U6cjYERdMaFnfWyvFf1HGavyYTc/FU4ktafQm7+35xy13Tdc1IRm/RoD9/82XIW/Yqtj Kcrw== X-Received: by 10.60.140.168 with SMTP id rh8mr303214oeb.76.1378755769152; Mon, 09 Sep 2013 12:42:49 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.51]) by mx.google.com with ESMTPSA id hl3sm14443740obb.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 12:42:48 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 9 Sep 2013 14:41:40 -0500 Message-Id: <1378755701-2051-10-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1378755701-2051-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1378755701-2051-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c01::22e 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' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Tomoki Sekiyama 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 Signed-off-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 = (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