From patchwork Wed Nov 22 11:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameeh Jubran X-Patchwork-Id: 10070277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93759603FA for ; Wed, 22 Nov 2017 11:31:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 805FE29C07 for ; Wed, 22 Nov 2017 11:31:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7333329C09; Wed, 22 Nov 2017 11:31:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD8E729C07 for ; Wed, 22 Nov 2017 11:31:14 +0000 (UTC) Received: from localhost ([::1]:38901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHTFH-00060e-Pv for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Nov 2017 06:31:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHTEa-00060K-B3 for qemu-devel@nongnu.org; Wed, 22 Nov 2017 06:30:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHTEV-00025r-Ln for qemu-devel@nongnu.org; Wed, 22 Nov 2017 06:30:28 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:41487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eHTEV-00025G-E3 for qemu-devel@nongnu.org; Wed, 22 Nov 2017 06:30:23 -0500 Received: by mail-wr0-x243.google.com with SMTP id z14so14206335wrb.8 for ; Wed, 22 Nov 2017 03:30:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=NYscNo+uuBpYmS/WLQrUg1+g4ztMx0jOaLwX0r01070=; b=J/1wJzLpxzjHMjBslmpCnIuuyUotPjrE3GfJQZ8mduEqYvRzd9LM/s66MuyUFk2max FhvP5HSVIwf1w/rS0kX926Pw856cq9AaahlpWKDu/l0Z2L14ASejYEffhgI6Ntn+8WFq vaQNpN+FAWWg8qrdSZQam/sZN4er/vVjNXJAMgb9Q/IrMpz/fz4NQL9mD7vutgd8GhZB gTzkmoIyzyDD4Cy/9SgalJfgelkWgigEgh8Eqy6c0wOStCv72timTC9++j53AfGMu1ax 10K0VIVELiUK/N0A+mAjSfEMZWTNHrBIFL1AiDQZuOqJEPYIrNnajOot6ZhJyOKHtfV+ 22eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NYscNo+uuBpYmS/WLQrUg1+g4ztMx0jOaLwX0r01070=; b=nQ4RksdM84yQjJaldxPEfypIKc+1pzxrZmOSfm5DkHqXWQFfAQWCkfwiiWQ/8sJRl+ RQsSZeJh30c0Tto6z5awnblFq1pe341LpdFtHim7swUqw0MfJjSN80rCYX7dC858bT6d j7xgaX5m9fBh0rs0Yva6kjsByrBJfxvxRIhC7Ixqzr0xENT27NpozKhL5DdIQZm/zO3K L/7R65tHCY+B/0T+5suj7WXB3suleeSScI4cnl7M0SpSAAmFa+si37bWAF5DuHC1114G ttdJj9xySBtcmuKETbF2aVFt6oaYOoj/cz37qwr6C9fyYwBLc2fCYoES3Eebnee9/PsJ iCig== X-Gm-Message-State: AJaThX7mZ/7NP8h4RWfWrmcWSyTnThxlaQSpaQn0UEDmM1lVW+dXL41G 1vd7/FLXJ4QDvmUAuFxCXDlGOW5m X-Google-Smtp-Source: AGs4zMYhXXgATMKp9T27v/AP/+A7gv6WnBGJdKb7J+ndeU/r54MtYbhpfVshz/B8daFyjcSgE8a2Hw== X-Received: by 10.223.138.138 with SMTP id y10mr18492271wry.167.1511350221402; Wed, 22 Nov 2017 03:30:21 -0800 (PST) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id t63sm8568918wme.35.2017.11.22.03.30.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Nov 2017 03:30:20 -0800 (PST) From: Sameeh Jubran To: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Date: Wed, 22 Nov 2017 13:30:14 +0200 Message-Id: <20171122113014.2512-1-sameeh@daynix.com> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH] qga-win: VSS: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sameeh Jubran We can get VSS_E_PROVIDER_ALREADY_REGISTERED error if for some reason the uninstall of qemu-ga didn't complete successfully. In this case we can try to unregister the component service and attempt to register it again. Signed-off-by: Sameeh Jubran --- qga/vss-win32/install.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 51838eeb26..e7bc5e1d9d 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -443,6 +443,15 @@ STDAPI DllRegisterServer(void) VSS_PROV_SOFTWARE, const_cast(QGA_PROVIDER_VERSION), g_gProviderVersion); + if (hr == (long int) VSS_E_PROVIDER_ALREADY_REGISTERED) { + DllUnregisterServer(); + hr = pVssAdmin->RegisterProvider(g_gProviderId, CLSID_QGAVSSProvider, + const_cast(QGA_PROVIDER_LNAME), + VSS_PROV_SOFTWARE, + const_cast(QGA_PROVIDER_VERSION), + g_gProviderVersion); + } + if (FAILED(hr)) { errmsg_dialog(hr, "RegisterProvider failed"); }